tree 357265cad94a3b04006b29059b87f79fe4a94930
parent 438b117473dc8293caa6a714a1a9d4f927bf9d7d
parent 67953778546ab2ac3dfbc4aa61b236895fd1ac2b
author Geoff Mendal <mendal@google.com> 1440890336 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440890336 +0000

am 67953778: (-s ours) am 999576d0: (-s ours) am 8038391a: (-s ours) am 469fa946: (-s ours) Import translations. DO NOT MERGE

* commit '67953778546ab2ac3dfbc4aa61b236895fd1ac2b':
  Import translations. DO NOT MERGE