Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Tue, 19 Apr 2011 20:38:51 +0000 (13:38 -0700)
committerErik Gilling <konkers@android.com>
Tue, 19 Apr 2011 20:38:54 +0000 (13:38 -0700)
Change-Id: I16e5fe9a9976a33ae102187988a240aa5f8a766b


Trivial merge