Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Thu, 3 Feb 2011 21:30:54 +0000 (13:30 -0800)
committerErik Gilling <konkers@android.com>
Thu, 3 Feb 2011 21:31:00 +0000 (13:31 -0800)
Change-Id: Ica2eff483e5326079d30bf1b650c8fd2264fcc53


Trivial merge