Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Fri, 7 Jan 2011 04:32:39 +0000 (20:32 -0800)
committerColin Cross <ccross@android.com>
Fri, 7 Jan 2011 04:32:39 +0000 (20:32 -0800)
commit04d8077a0330c97b08cd1747325f3428fa61be26
tree2c5ab3e4ef3fb453858b9b91037c0cd0a3dad65b
parenta45f27a0089f4d6b4936f87a6f5f14649c2c46fe
parente7f5fdf7316d97feafc18b8ac00fc69f1dcf45bd
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36