Merge branch android-tegra2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Fri, 15 Apr 2011 22:58:11 +0000 (15:58 -0700)
committerErik Gilling <konkers@android.com>
Fri, 15 Apr 2011 22:58:16 +0000 (15:58 -0700)
Change-Id: Ic0af83f0d35b7381d6a8fa21a9417c9aa6353b24


Trivial merge