Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Wed, 13 Apr 2011 15:15:54 +0000 (08:15 -0700)
committerErik Gilling <konkers@android.com>
Wed, 13 Apr 2011 15:16:02 +0000 (08:16 -0700)
Change-Id: Ifd8896e66a90ccad029a4f179c691e416ade75c8


Trivial merge