tree 78148f4ea7a01b1dc65fa2ac0114409cf1e48c62
parent 8f8ba83ce953c6757990548610d6318d94188bb3
parent 87c4199600dcc6933abffa8bc9c04abf52483575
author Geoff Mendal <mendal@google.com> 1454498976 +0000
committer android-build-merger <android-build-merger@google.com> 1454498976 +0000

Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 6779c7d415  -s ours
am: 87c4199600  -s ours

* commit '87c4199600dcc6933abffa8bc9c04abf52483575':
  Import translations. DO NOT MERGE