Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Mon, 28 Feb 2011 23:29:58 +0000 (15:29 -0800)
committerErik Gilling <konkers@android.com>
Mon, 28 Feb 2011 23:30:01 +0000 (15:30 -0800)
Change-Id: I7e6c38730fba12e9d60910da5df8470a9584f29b


Trivial merge