tree 4e8400a1a07b08c54552f30bfcde25a87ceda5d5
parent 82c45e07c2c6771142ad7b7dffaae23f9151d597
parent 1207a50100bbb3aaa55fc6394e13ad18fc019f8e
author Geoff Mendal <mendal@google.com> 1443643884 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443643884 +0000

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

* commit '1207a50100bbb3aaa55fc6394e13ad18fc019f8e':
  Import translations. DO NOT MERGE