tree a0d3a5f552c2ed255cb1dfaa2f38c175b1422ddc
parent 25cfa1203d7a5de7db89dd2b693725bedd47dc67
parent 1171e6a3b196c5304f2221fb22b23d097294b6dc
author Geoff Mendal <mendal@google.com> 1434490121 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434490121 +0000

am 1171e6a3: (-s ours) am 9753a3ae: (-s ours) Import translations. DO NOT MERGE

* commit '1171e6a3b196c5304f2221fb22b23d097294b6dc':
  Import translations. DO NOT MERGE