tree 0d832e8e19a2640d1b49439400bf14dc7a5a0d8b
parent 7cb3b1241a6c52522530dd64a1469a2025df99ae
parent adacc63c9af94414c393b51cfc4ce06e8252bab2
author Geoff Mendal <mendal@google.com> 1423776673 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423776673 +0000

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

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