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:
The Android Open Source Project
2013-06-06 10:43:03 -07:00
committed by Android Git Automerger

Diff Content Not Available