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)
commit56d07ce771da9fe1a4a738a63eb31709bcbf1021
tree3636a01fb14e856edcf02a79e98d0cbf0a415d19
parentfee6da91b417f081e68a11c1736358e3ace83fd1
parent493edeba1c2b5af4f1aad84b6725de1aea7bab06
Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36

Change-Id: Ifd8896e66a90ccad029a4f179c691e416ade75c8