Merge commit '17b14bd36aba265ac6bffc2626d8db29713d7c45' into eclair-plus-aosp * commit '17b14bd36aba265ac6bffc2626d8db29713d7c45': DO NOT MERGE
Merge commit '17b14bd36aba265ac6bffc2626d8db29713d7c45' into eclair-plus-aosp * commit '17b14bd36aba265ac6bffc2626d8db29713d7c45': DO NOT MERGE