tree 501ba5065aff93dda807dbd57d256dc87125d015
parent 97e5272958bce3e4463d7d9eb17e70aee3829d9a
parent 419407eaea4e8c76d6f1de5f6fc5ff7563633c33
author Bill Yi <byi@google.com> 1511737552 +0000
committer android-build-merger <android-build-merger@google.com> 1511737552 +0000

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 419407eaea  -s ours

Change-Id: I5689ca60c3bf9a29c59380c7d3002c6007f8eb05