Merge commit '49fc4a9dd39e520d87fd2b9f1a20263570221ebe' into eclair-mr2-plus-aosp * commit '49fc4a9dd39e520d87fd2b9f1a20263570221ebe': Backport the change I30b141a2 from MR2 to MR1. Do not merge.
This commit is contained in:
Merge commit '49fc4a9dd39e520d87fd2b9f1a20263570221ebe' into eclair-mr2-plus-aosp * commit '49fc4a9dd39e520d87fd2b9f1a20263570221ebe': Backport the change I30b141a2 from MR2 to MR1. Do not merge.