Merge branch 'android-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Wed, 2 Feb 2011 18:03:34 +0000 (10:03 -0800)
committerColin Cross <ccross@android.com>
Wed, 2 Feb 2011 18:03:34 +0000 (10:03 -0800)

Trivial merge