tree 9086d2070202c8dd2a16263976d09fd0030cf9e2
parent 80b9f01d62e80adfc15a4586e21f93967e5fc1dd
parent 47b04832a58ab1c52582a792c45b03d578220733
author Geoff Mendal <mendal@google.com> 1439994759 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439994759 +0000

am 47b04832: (-s ours) am 5b9e3290: (-s ours) am 257a9a87: (-s ours) am 81d99d47: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '47b04832a58ab1c52582a792c45b03d578220733':
  Import translations. DO NOT MERGE