tree 1f81e794f70e9e0986ae114ef5707d510c50b9ff
parent 098cb2470fa8f13bb3da6267dd33495391b508cc
parent 8038391a0841f6a038a9dd3592675e794678835b
author Geoff Mendal <mendal@google.com> 1440889049 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440889049 +0000

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

* commit '8038391a0841f6a038a9dd3592675e794678835b':
  Import translations. DO NOT MERGE