Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Fri, 7 Jan 2011 02:14:25 +0000 (18:14 -0800)
committerColin Cross <ccross@android.com>
Fri, 7 Jan 2011 02:14:25 +0000 (18:14 -0800)
commitf6878f91ce1df848577774a676270b20b98e9f14
treef127391e0ab2c5ab490f99f752e63b5bab41373d
parent24b11efa775e6d807d8b84a3a04d74163fd83573
parentab3fe23e4a9bad1a04cf40393fc65ece67b68723
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36