tree 4382b2cca361ccbe83c9d5bec756559c1bf27236
parent 8f43884c7545f303cd19aba3691af658a25904a2
parent 531dfc8526b9580e6408928bd72cf7ab33fe713c
author Geoff Mendal <mendal@google.com> 1445863232 +0000
committer android-build-merger <android-build-merger@google.com> 1445863232 +0000

Import translations. DO NOT MERGE am: 049b3bbbeb  -s ours
am: 531dfc8526  -s ours

* commit '531dfc8526b9580e6408928bd72cf7ab33fe713c':
  Import translations. DO NOT MERGE