Merge branch 'android-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Sat, 15 Jan 2011 01:32:17 +0000 (17:32 -0800)
committerColin Cross <ccross@android.com>
Sat, 15 Jan 2011 01:32:17 +0000 (17:32 -0800)
commit61327f2aa0b265952ee8834c920cbbf80cace95e
tree8496177b27cb619538ffd1f67733d9312cc5ab6e
parentda7187758bea309525069c6110d80520cb6635ab
parent255914b9277591b2afc8f5f0076ddcf379e41273
Merge branch 'android-2.6.36' into android-tegra-2.6.36