Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Mon, 24 Jan 2011 20:53:22 +0000 (12:53 -0800)
committerErik Gilling <konkers@android.com>
Mon, 24 Jan 2011 20:53:26 +0000 (12:53 -0800)
commita7d10af945d9ac5c7a13212e2e2c20d809476306
treedc21487ef28178259a1565dcbb15dfdde090c0fa
parentb0505e8b7db1fec487a5f3174c2376c04d516a73
parent8fdd40eb453527ca6133d61463e3a97854be84e6
Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36

Change-Id: Iab6dcbaa8e8277ecc1381322a7884a1fa8046755