tree 00150c1f0a37179b532304998dbf8827467018df
parent 0367b1c123556ed0dc2d1326c16e0409aa258904
parent a8bbc7ac9afb140c1e07db96cd642f41be18086f
author Geoff Mendal <mendal@google.com> 1436800280 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436800280 +0000

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

* commit 'a8bbc7ac9afb140c1e07db96cd642f41be18086f':
  Import translations. DO NOT MERGE