tree 78148f4ea7a01b1dc65fa2ac0114409cf1e48c62
parent 42ff5c11a5075f258e7b77f74a230deae6f80d68
parent 3350974f82c7743e204d57f5f19b554e67bdad63
author Geoff Mendal <mendal@google.com> 1454498256 +0000
committer android-build-merger <android-build-merger@google.com> 1454498256 +0000

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 4a27667bf5  -s ours am: b1be124b15  -s ours
am: 3350974f82  -s ours

* commit '3350974f82c7743e204d57f5f19b554e67bdad63':
  Import translations. DO NOT MERGE