tree 5e2d50bc58c1131aa8ede016f44b420d52ec4890
parent ebd1805902eb5565c8ed97dd8067474969f777e2
parent dab1a83db299acd4d80b63ce862d6cd882380017
author Geoff Mendal <mendal@google.com> 1423772728 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423772728 +0000

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

* commit 'dab1a83db299acd4d80b63ce862d6cd882380017':
  Import translations. DO NOT MERGE