tree 78148f4ea7a01b1dc65fa2ac0114409cf1e48c62
parent 20166456aaf28e5ea9e92964bb61ad08d48044e5
parent b8758b39a937ed5b77ab90d5a446445741084b2e
author Geoff Mendal <mendal@google.com> 1454497874 +0000
committer android-build-merger <android-build-merger@google.com> 1454497874 +0000

Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 091513d6e8  -s ours am: a0159dfc08  -s ours
am: b8758b39a9  -s ours

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