Merge branch 'android-tegra' into android-tegra-moto
authorErik Gilling <konkers@android.com>
Wed, 13 Apr 2011 01:00:19 +0000 (18:00 -0700)
committerErik Gilling <konkers@android.com>
Wed, 13 Apr 2011 01:00:19 +0000 (18:00 -0700)
commitb99e516bb2bc3d7d72b74039b342f7d2254b4143
treee01922ea3aacd3dcbdb5102996370de1089f6bc2
parentcd2ff7070071839c4a3fc830679c5af6e81a1e57
parent0b8bff5ecc4b9077207db4f0adc4a3fdfb70fdb9
Merge branch 'android-tegra' into android-tegra-moto