Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Tue, 15 Feb 2011 02:07:58 +0000 (18:07 -0800)
committerErik Gilling <konkers@android.com>
Tue, 15 Feb 2011 02:08:14 +0000 (18:08 -0800)
Change-Id: Icb97546afa6da84601ce59c1ad00998196b43df6


Trivial merge