tree 1d88563fe2f5cabe023416fe748e0b180435b627
parent 76ae5a498dfddce4b372ebb9baaa74fd9c8e54e0
parent 6ccc89cb13f96b1ca6dfdea72bf7af4b3f3645ef
author Bill Yi <byi@google.com> 1502899225 +0000
committer android-build-merger <android-build-merger@google.com> 1502899225 +0000

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

Change-Id: I1a00ce8149f6dfcb40763ee1dad1a6bef4ce15e7