tree 8745c9b3956d8540c911f68c96ccfa13c76451ad
parent a4ebcf3be95e4d28de8e016649b938f7e0632bd8
parent 86117ad059db9b0fa83b1ae8677d80998e6e5355
author Geoff Mendal <mendal@google.com> 1425055195 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425055195 +0000

am 86117ad0: (-s ours) Import translations. DO NOT MERGE

* commit '86117ad059db9b0fa83b1ae8677d80998e6e5355':
  Import translations. DO NOT MERGE