Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Wed, 26 Jan 2011 01:59:12 +0000 (17:59 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Wed, 26 Jan 2011 01:59:21 +0000 (17:59 -0800)
commit61ca3841e390881014d03a4324ea80bf1a6fc00e
treeefe13174501125b4a1882f4cfa4c32fc01b3580d
parent671ee8d974ced3c87c7772f91ec76a381ac25b3e
parented23bf7bfc6e193f8eaddf6fdf35fb228340c110
Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36

Change-Id: I003a21d788d6cdcb6594b1328b13a1913c5a552f