Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Mon, 24 Jan 2011 20:53:22 +0000 (12:53 -0800)
committerErik Gilling <konkers@android.com>
Mon, 24 Jan 2011 20:53:26 +0000 (12:53 -0800)
Change-Id: Iab6dcbaa8e8277ecc1381322a7884a1fa8046755


Trivial merge