tree 7457074d90d16abe1acfe742501bbb6543c06b69
parent 0c6eba366e77daeedecdffdd4d1dcf9406d39117
parent 81d99d47831153cfa71afaa1831b7a1e025e3069
author Geoff Mendal <mendal@google.com> 1439993726 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439993726 +0000

am 81d99d47: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '81d99d47831153cfa71afaa1831b7a1e025e3069':
  Import translations. DO NOT MERGE