Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Wed, 3 Nov 2010 21:05:13 +0000 (14:05 -0700)
committerErik Gilling <konkers@android.com>
Wed, 3 Nov 2010 21:05:16 +0000 (14:05 -0700)
Change-Id: I6cfe301799ce71f94780b814280e15b1180bad37


Trivial merge