Merge branch 'android-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Sat, 8 Jan 2011 01:16:59 +0000 (17:16 -0800)
committerColin Cross <ccross@android.com>
Sat, 8 Jan 2011 01:16:59 +0000 (17:16 -0800)
commitc37bff78783d40d6e604129135c207e279de902f
treeaa977895b5ef83116af31169427ec633b3d17298
parente7f5fdf7316d97feafc18b8ac00fc69f1dcf45bd
parent77fc4228f72d803cace13cfec6a4076b38601bd5
Merge branch 'android-2.6.36' into android-tegra-2.6.36