Merge commit '5ff24d5da414db4e8c2ebe98f40976e7be62b72d' into eclair-plus-aosp * commit '5ff24d5da414db4e8c2ebe98f40976e7be62b72d': DO NOT MERGE
Merge commit '5ff24d5da414db4e8c2ebe98f40976e7be62b72d' into eclair-plus-aosp * commit '5ff24d5da414db4e8c2ebe98f40976e7be62b72d': DO NOT MERGE