Merge remote branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Tue, 14 Dec 2010 05:16:23 +0000 (21:16 -0800)
committerErik Gilling <konkers@android.com>
Tue, 14 Dec 2010 05:16:28 +0000 (21:16 -0800)
commit5ea6e6d5ed2a5d4dfb9132b6c6d7c65212c948ee
tree78689b3953f03a1ed2c11d501519eba98f167614
parentbdc9c8c04726fd6a5a22194e79df7140667c8c20
parent98bf149e45c7a6e93d2c09ff789f1e7c970ec9a7
Merge remote branch android-tegra-2.6.36 into android-tegra-moto-2.6.36

Change-Id: Ib347f9de55fa0c6492f5a39585eff54cc661d819