Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Wed, 15 Dec 2010 02:11:59 +0000 (18:11 -0800)
committerErik Gilling <konkers@android.com>
Wed, 15 Dec 2010 02:12:15 +0000 (18:12 -0800)
commit0fe8d7bf9834dbafd94dcc3f981e593e06a76015
tree7e431b8e8b4e5e5a4439eabd375bc13c4cca6fd6
parent84a3de4c2c7acac928848faefe5df0fcadf178ba
parent8afb3d34090820f4128e6e2182a7231423c47b28
Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36

Change-Id: Id806720fee83d7515a38dc601a7570a3da55fec3