tree 1453f85d47a6d49d44a709f66dc75bb959b0dda0
parent a2519e3a1444b8421261348279883108ad1d00be
parent ae6b410823b2f8a58a368cad7586acbe977c513f
author Baligh Uddin <baligh@google.com> 1399044835 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399044835 +0000

am ae6b4108: (-s ours) Import translations. DO NOT MERGE

* commit 'ae6b410823b2f8a58a368cad7586acbe977c513f':
  Import translations. DO NOT MERGE