Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Tue, 16 Nov 2010 22:34:28 +0000 (14:34 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Tue, 16 Nov 2010 22:34:34 +0000 (14:34 -0800)
commitcefe14a246782cfd4a4a484ff09779e86820f030
treeecd1364a82712707bd45a1d3e5096ab931786153
parent42831b484a97a2a828cffa748c9edb14d845d6fb
parent6ee219d7ca3c708c93928fa4aaeb52b203d0cdab
Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36

Change-Id: Ie3ee3a63df7ba098c3480a2f4f5c669a74909688