Merge "Cherry-picked from 6f00e7fc in master. Do not merge." into ics-mr1
This commit is contained in:
committed by
Android (Google) Code Review
commit
c03537267d