tree 7f40c5bf92c1bdba6ad67d2beb71759d77d4a152
parent 3203791351e56e5ad0ead42c967fac0e154cbf7c
parent 35d2cf1c0c75342b307fa90f1508741b10169c9f
author Geoff Mendal <mendal@google.com> 1444221985 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444221985 +0000

am 35d2cf1c: (-s ours) am b4a027d0: (-s ours) Import translations. DO NOT MERGE

* commit '35d2cf1c0c75342b307fa90f1508741b10169c9f':
  Import translations. DO NOT MERGE