Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Thu, 3 Feb 2011 21:30:54 +0000 (13:30 -0800)
committerErik Gilling <konkers@android.com>
Thu, 3 Feb 2011 21:31:00 +0000 (13:31 -0800)
commit318c6101b4d9874eff7cedc308678617e71394eb
treefec832788e2818ea9c2dd441e7ee14310cc2a61e
parentc383a7487b875b981c23bccb29721f047dfd8a95
parenta979d00287bcd3297bd13a59534073e6faa570c9
Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36

Change-Id: Ica2eff483e5326079d30bf1b650c8fd2264fcc53