Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Mon, 18 Oct 2010 19:13:36 +0000 (12:13 -0700)
committerErik Gilling <konkers@android.com>
Mon, 18 Oct 2010 19:13:47 +0000 (12:13 -0700)
commitcb6aefb10fed33f38de2cee97299d44a2099d0a3
treed493c44111c7340f005b5fab92fbf753a7af2616
parent66052d01aca450c738a89a25354e00037b1b9f58
parent5b3a1cd90c79a9726ae1c45888088c73d629fb11
Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36

Change-Id: Iafbbd226a23d555ad198180d5e17c13a4bb14cf0