Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Thu, 7 Apr 2011 21:37:03 +0000 (14:37 -0700)
committerErik Gilling <konkers@android.com>
Thu, 7 Apr 2011 21:37:14 +0000 (14:37 -0700)
commit17286cfd88964880eddf6b570f2b0da500191a23
tree045de1fca9d1098cdc1da83e22f631b3682476cd
parentbbfcda71e628c110481a62e1633b770ecfe4807e
parent8426dbfc3a189907ce3a309065ebd6126ac0d555
Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36

Change-Id: I190487c0932d67872e1c29c0d2296f24a515851c