Merge remote branch android-2.6.36 into android-tegra-2.6.36
authorErik Gilling <konkers@android.com>
Wed, 15 Dec 2010 02:10:08 +0000 (18:10 -0800)
committerErik Gilling <konkers@android.com>
Wed, 15 Dec 2010 02:10:32 +0000 (18:10 -0800)
Change-Id: Ice30bc601132f829abd664c68ddc61cbcdb8668c


Trivial merge