Merge branch android-tegra2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Fri, 15 Apr 2011 22:58:11 +0000 (15:58 -0700)
committerErik Gilling <konkers@android.com>
Fri, 15 Apr 2011 22:58:16 +0000 (15:58 -0700)
commitd019b44990a7cd574e354a173fcb8c2c77861019
tree50f342debbdaba5f80fc9e7ec8da056b663b7662
parent946fb0a968e7817a573e0710ceb7e292a2f1c5ce
parentd99cea140dba998d7ee1a24a7d32ec1b78c02f3f
Merge branch android-tegra2.6.36 into android-tegra-moto-2.6.36

Change-Id: Ic0af83f0d35b7381d6a8fa21a9417c9aa6353b24