tree 4ce3215693926ab94279f50f6c8520e4f05ca1fd
parent 485f373c9c4cc493af0add79650e2dbdb951243b
parent 992317c8a6366e7d7faf7532672de632ed374a34
author Geoff Mendal <mendal@google.com> 1436801514 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436801514 +0000

am 992317c8: (-s ours) am b72aa65b: (-s ours) Import translations. DO NOT MERGE

* commit '992317c8a6366e7d7faf7532672de632ed374a34':
  Import translations. DO NOT MERGE