Merge branch 'android-2.6.36' into android-tegra-2.6.36
authorIliyan Malchev <malchev@google.com>
Tue, 23 Nov 2010 00:06:23 +0000 (16:06 -0800)
committerIliyan Malchev <malchev@google.com>
Tue, 23 Nov 2010 00:06:27 +0000 (16:06 -0800)
commitb7b7ed87ac9d4b1bb8a35a2b02f1d0effb668c76
treef6643000093777133216efca07c8370a593f1126
parent1f2e04a35d3568d1b31ddeee41fd5549f16f471e
parent0d06d74be994a7c4d0c6e145217125d312ee9ebd
Merge branch 'android-2.6.36' into android-tegra-2.6.36

Signed-off-by: Iliyan Malchev <malchev@google.com>