tree b597945814d89e6cf4c0b84b0f40ec055f1a7014
parent 12f65083aa483baa6e84bb1470ffbaba7740fb19
parent dfe2ed8fc105f4b37c497b7a20b136e53b8aa8be
author Geoff Mendal <mendal@google.com> 1439387634 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439387634 +0000

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

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