tree c4ed70d8d6d2f1e52225eeb56ad6e8f148ccb300
parent cc344c58a90de5c9ee9083457a3320861d1435e4
parent db7879c09c0a3a5168bee10f547f34cac9f63a67
author Geoff Mendal <mendal@google.com> 1439388079 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439388079 +0000

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

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