Merge commit '7614d3d819315b1ca15088e617f12d0f0ea41b06' into eclair-mr2-plus-aosp * commit '7614d3d819315b1ca15088e617f12d0f0ea41b06': Porting change I064698b3 from mr2 to eclair.
This commit is contained in:
Merge commit '7614d3d819315b1ca15088e617f12d0f0ea41b06' into eclair-mr2-plus-aosp * commit '7614d3d819315b1ca15088e617f12d0f0ea41b06': Porting change I064698b3 from mr2 to eclair.