tree 278dd37c1cfe2cd85af58b5c8f7f94a93b3bab0c
parent 9548f85d9dc4207c3d1a3eed51f98131f8210c5f
parent 9ff5be7674e3a925dc371bc812b220f3c476c501
author Geoff Mendal <mendal@google.com> 1454358384 +0000
committer android-build-merger <android-build-merger@google.com> 1454358384 +0000

Import translations. DO NOT MERGE
am: 9ff5be7674  -s ours

* commit '9ff5be7674e3a925dc371bc812b220f3c476c501':
  Import translations. DO NOT MERGE