Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Mon, 7 Feb 2011 23:20:30 +0000 (15:20 -0800)
committerErik Gilling <konkers@android.com>
Mon, 7 Feb 2011 23:20:38 +0000 (15:20 -0800)
Change-Id: I7647524dbf346987bcd1dcc1c19479d74470b308


Trivial merge