Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Thu, 7 Apr 2011 21:37:03 +0000 (14:37 -0700)
committerErik Gilling <konkers@android.com>
Thu, 7 Apr 2011 21:37:14 +0000 (14:37 -0700)
Change-Id: I190487c0932d67872e1c29c0d2296f24a515851c


Trivial merge