Merge branch 'android-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Tue, 26 Oct 2010 01:48:09 +0000 (18:48 -0700)
committerColin Cross <ccross@android.com>
Tue, 26 Oct 2010 01:48:09 +0000 (18:48 -0700)

Trivial merge