Merge commit '195a507fc364d249c8ff4d3cd86dea00f383b0aa' into eclair-mr2-plus-aosp * commit '195a507fc364d249c8ff4d3cd86dea00f383b0aa': a possible fix for the bug http://b/issue?id=2200637
Merge commit '195a507fc364d249c8ff4d3cd86dea00f383b0aa' into eclair-mr2-plus-aosp * commit '195a507fc364d249c8ff4d3cd86dea00f383b0aa': a possible fix for the bug http://b/issue?id=2200637