tree b7080f8b489297b5385fde4c5506b52d57daabf9
parent 276378eac39144462b1a5c5b522a00d8066b26d9
parent 6899720ef28d8a1e15fb473d872b9af4e3fff8aa
author Geoff Mendal <mendal@google.com> 1424993153 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424993153 +0000

am 6899720e: (-s ours) am 5b249fdc: (-s ours) Import translations. DO NOT MERGE

* commit '6899720ef28d8a1e15fb473d872b9af4e3fff8aa':
  Import translations. DO NOT MERGE