tree d14ba40cf46738e40d7947a078dd587dfb440fba
parent 4cfb7e36501c155a6689c81f25a560b06071822d
parent 42630b77c4963abf88ff8429741cf6d6c55ad11e
author Geoff Mendal <mendal@google.com> 1431574874 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431574874 +0000

am 42630b77: (-s ours) Import translations. DO NOT MERGE

* commit '42630b77c4963abf88ff8429741cf6d6c55ad11e':
  Import translations. DO NOT MERGE