tree 212046cfb90dbba8529d00d2bf64145138a6f899
parent c567470803e76646c8b356f062dca79e7661c5c6
parent 0ed51eff351d940b8aa2ce92f28c805e307bfb9f
author Geoff Mendal <mendal@google.com> 1424992476 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424992476 +0000

am 0ed51eff: (-s ours) Import translations. DO NOT MERGE

* commit '0ed51eff351d940b8aa2ce92f28c805e307bfb9f':
  Import translations. DO NOT MERGE