Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Tue, 15 Feb 2011 02:07:58 +0000 (18:07 -0800)
committerErik Gilling <konkers@android.com>
Tue, 15 Feb 2011 02:08:14 +0000 (18:08 -0800)
commitef80a0a5ffe88e508eaf855e79be0b52ba6727d1
tree969904a069a61b64477105c087802a0e3b61c779
parent254b5e1c65cd70f16f44f7f2e7ee2b2b76cebecc
parent21cc82b575b16307184369646e98afc1116f6db9
Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36

Change-Id: Icb97546afa6da84601ce59c1ad00998196b43df6