Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Wed, 2 Feb 2011 18:04:07 +0000 (10:04 -0800)
committerColin Cross <ccross@android.com>
Wed, 2 Feb 2011 18:04:07 +0000 (10:04 -0800)
commit8bc40e69f2fad768786bc652e31c21e104aa6b54
tree07d411ac9ba7d9e9c7a6b4ab62f8f45a0ae1146a
parentda8a91dac516df351d67f13067db7e015a568ffe
parentc8dd518b20b05eb07fe2ab024616e986a85ad5dd
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36