tree 1ccc64274562901c7ab1a335dc79a3061628d55d
parent 8b89e8889c7564850fdb626c31a52f0fd53278d0
parent 6508e48e9e2edcebb8fc615dcaaaaeaf6321b7e5
author Geoff Mendal <mendal@google.com> 1416410923 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416410923 +0000

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

* commit '6508e48e9e2edcebb8fc615dcaaaaeaf6321b7e5':
  Import translations. DO NOT MERGE