tree 8c0a94d8a885ad9b7b94e415564beaab6cfe0af3
parent d81b755d764f65829d4553ac2c36172d80fb7576
parent 616b5f7a9de802bcc8208bbd1e93cbe3c8e26593
author Geoff Mendal <mendal@google.com> 1436804843 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436804843 +0000

am 616b5f7a: (-s ours) am 1181b92d: (-s ours) am 6eee5e4d: (-s ours) Import translations. DO NOT MERGE

* commit '616b5f7a9de802bcc8208bbd1e93cbe3c8e26593':
  Import translations. DO NOT MERGE