tree 78148f4ea7a01b1dc65fa2ac0114409cf1e48c62
parent 3f33e344dd8cd60bc4e0e4c3ce6f27efda974c38
parent 381c7ce4ed857113d838743d7de224fab021e278
author Geoff Mendal <mendal@google.com> 1454496263 +0000
committer android-build-merger <android-build-merger@google.com> 1454496263 +0000

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 497300badb  -s ours am: abaebda3ff  -s ours
am: 381c7ce4ed  -s ours

* commit '381c7ce4ed857113d838743d7de224fab021e278':
  Import translations. DO NOT MERGE