Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Mon, 7 Feb 2011 23:20:30 +0000 (15:20 -0800)
committerErik Gilling <konkers@android.com>
Mon, 7 Feb 2011 23:20:38 +0000 (15:20 -0800)
commit2a65edc3aeb4a6022bea5e768553b046ddf36345
treea0e21a1637cf730ec56e932650c782669a75e9ad
parenta6741d3e16f4e06787cf2de3945659260bba5cbf
parente51ab3740df4c2880507045f999c4bde3563c6a2
Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36

Change-Id: I7647524dbf346987bcd1dcc1c19479d74470b308