am 35eea54a: (-s ours) Merge change 6935 into donut
Merge commit '35eea54a405cfeb88e48fed4bfa59687351c49a0' * commit '35eea54a405cfeb88e48fed4bfa59687351c49a0': DO NOT MERGE: backporting from master:
This commit is contained in:
committed by
The Android Open Source Project
commit
586d110ad4