Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Fri, 12 Nov 2010 02:14:54 +0000 (18:14 -0800)
committerErik Gilling <konkers@android.com>
Fri, 12 Nov 2010 02:14:59 +0000 (18:14 -0800)
Change-Id: I46be67ca4c30a76b03f59c155628c7fc1ea990f4


Trivial merge