Merge remote branch android-2.6.36 into android-tegra-2.6.36
authorErik Gilling <konkers@android.com>
Tue, 14 Dec 2010 05:12:12 +0000 (21:12 -0800)
committerErik Gilling <konkers@android.com>
Tue, 14 Dec 2010 05:12:33 +0000 (21:12 -0800)
Change-Id: Ifd4c8ddc62f0c6e213d203498891d151d9b06442


Trivial merge