Merge remote branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Tue, 14 Dec 2010 05:16:23 +0000 (21:16 -0800)
committerErik Gilling <konkers@android.com>
Tue, 14 Dec 2010 05:16:28 +0000 (21:16 -0800)
Change-Id: Ib347f9de55fa0c6492f5a39585eff54cc661d819


Trivial merge