Merge branch 'android-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Sat, 18 Dec 2010 01:23:38 +0000 (17:23 -0800)
committerColin Cross <ccross@android.com>
Sat, 18 Dec 2010 01:23:38 +0000 (17:23 -0800)
commit8ab30a059d66645d6ddf69f18a7342d761f3c0b9
treee1ab52a4dd678b3e2cff503a44d7b89f32076164
parent2401c286cae84b2265e21fd69cf0f9a62c39f38c
parent05946a1e0fdb011ac0e6638ee60b181c584f127b
Merge branch 'android-2.6.36' into android-tegra-2.6.36