tree a25840e1e95287f6043e7f53ad1abf051eae940a
parent 388a53be959763e5d5249ef79fe0f5e12e29c23b
parent 8723453eda1885e8f4f3092f3130b0c607ab774b
author Baligh Uddin <baligh@google.com> 1366297074 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366297074 -0700

am 8723453e: am c54300be: Import translations. DO NOT MERGE

* commit '8723453eda1885e8f4f3092f3130b0c607ab774b':
  Import translations. DO NOT MERGE