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)
commit8afb3d34090820f4128e6e2182a7231423c47b28
tree50e8e872e086e3753cc49f17e8ebf2ebb4565ec1
parent2da4db5bffe757188b0a06235e5e68505a5c20c4
parenta05f03bf6ece7619877d6b3ccfbc7597f6df7b40
Merge remote branch android-2.6.36 into android-tegra-2.6.36

Change-Id: Ice30bc601132f829abd664c68ddc61cbcdb8668c