Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Thu, 7 Apr 2011 23:56:56 +0000 (16:56 -0700)
committerErik Gilling <konkers@android.com>
Thu, 7 Apr 2011 23:57:07 +0000 (16:57 -0700)
Change-Id: I2fa2ffc7b946ae58b94b75415f64f4f735bd5ee9


Trivial merge