Merge branch 'android-tegra' into android-tegra-moto
authorErik Gilling <konkers@android.com>
Thu, 21 Oct 2010 01:28:16 +0000 (18:28 -0700)
committerErik Gilling <konkers@android.com>
Thu, 21 Oct 2010 01:28:16 +0000 (18:28 -0700)

Trivial merge