Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Wed, 15 Dec 2010 02:11:59 +0000 (18:11 -0800)
committerErik Gilling <konkers@android.com>
Wed, 15 Dec 2010 02:12:15 +0000 (18:12 -0800)
Change-Id: Id806720fee83d7515a38dc601a7570a3da55fec3


Trivial merge