am 6af540e6: Fix issue 2422322 again.
Merge commit '6af540e6c360750623644c6b25e3d97590990694' into eclair-plus-aosp * commit '6af540e6c360750623644c6b25e3d97590990694': Fix issue 2422322 again.
This commit is contained in:
commit
fee0b3751f