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)

Trivial merge