Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Fri, 19 Nov 2010 00:40:10 +0000 (16:40 -0800)
committerErik Gilling <konkers@android.com>
Fri, 19 Nov 2010 00:40:14 +0000 (16:40 -0800)
Change-Id: Iacc215c30e5b3cb0634c671a7e14abeddec01a2e


Trivial merge