Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Fri, 12 Nov 2010 02:14:54 +0000 (18:14 -0800)
committerErik Gilling <konkers@android.com>
Fri, 12 Nov 2010 02:14:59 +0000 (18:14 -0800)
commita0c6c292f361f4fa88dcdce068e7ab3f3b512978
tree6b93239d41dd51ad953e3a7ebbe01885ee6a7666
parent760288c357c8cf1fc85f2e0d42f0ed117fb5d6fd
parent1730a615ef7ff48c40c3dd55296df8c580072850
Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36

Change-Id: I46be67ca4c30a76b03f59c155628c7fc1ea990f4