Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Mon, 18 Oct 2010 19:13:36 +0000 (12:13 -0700)
committerErik Gilling <konkers@android.com>
Mon, 18 Oct 2010 19:13:47 +0000 (12:13 -0700)
Change-Id: Iafbbd226a23d555ad198180d5e17c13a4bb14cf0


Trivial merge