Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Thu, 3 Feb 2011 02:43:02 +0000 (18:43 -0800)
committerErik Gilling <konkers@android.com>
Thu, 3 Feb 2011 02:43:07 +0000 (18:43 -0800)
Change-Id: I4bbe9b15e3f6f21b0c6e88010974da983ac9ab23


Trivial merge