tree 1bb4f74d62ce290fe3d3c8dfc1e606ed5352f72e
parent b9e4739ac20adfc9f5adb6de46ea4055b88229da
parent a5698f209dc9d79382233db011810f8e8f88c2c2
author Geoff Mendal <mendal@google.com> 1436979252 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436979252 +0000

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

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