tree 6ccf3dc6ca707b3566534ad0acc0767f38051dec
parent e5dbb4fb21ade1e4f64104071884046b428c78a9
parent 819e36d944b7df8f3634eb19150beb446a4ea4e8
author Geoff Mendal <mendal@google.com> 1413226397 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413226397 +0000

am 819e36d9: (-s ours) am f4dad830: (-s ours) Import translations. DO NOT MERGE

* commit '819e36d944b7df8f3634eb19150beb446a4ea4e8':
  Import translations. DO NOT MERGE