tree e671bd677b3e875f0309e141e4d9830cb46126cf
parent 1ccebc378acc8c1f7a37da512d3b56068c4e89bf
parent 034f1da2a136a4cdec4e0fb5ad1672924331c27c
author Geoff Mendal <mendal@google.com> 1415029520 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415029520 +0000

am 034f1da2: (-s ours) am f8fd72ea: (-s ours) Import translations. DO NOT MERGE

* commit '034f1da2a136a4cdec4e0fb5ad1672924331c27c':
  Import translations. DO NOT MERGE