tree 7115d80b14a6d1255a470c24c7a42a3ecfb90c2b
parent 7b664a3773874976a625bc245f30d310cb72dee7
parent 49f1dba5a829829456871362469190da334aaed2
author Geoff Mendal <mendal@google.com> 1413387861 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413387861 +0000

am 49f1dba5: (-s ours) am 2b93e202: (-s ours) Import translations. DO NOT MERGE

* commit '49f1dba5a829829456871362469190da334aaed2':
  Import translations. DO NOT MERGE