Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Thu, 13 Jan 2011 04:21:55 +0000 (20:21 -0800)
committerColin Cross <ccross@android.com>
Thu, 13 Jan 2011 04:21:55 +0000 (20:21 -0800)
commitcb9e11f154594224f70d9b21c05ccaabad23f47c
treed1c78d5f01678153fcf7760e6a6e961954e5828b
parentdda0b352a7dac2c7eb188ffe2091bd509ce3853b
parentda7187758bea309525069c6110d80520cb6635ab
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36