am 8548ddf2
: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '8548ddf229d1438cff6904921af84814305a4ec5': Import translations. DO NOT MERGE
This commit is contained in:
committed by
Android Git Automerger
commit
ac968945e2