tree 8dac9a42d7e98e4a1a7093c7f7bf0d6a214fb9d6
parent 4b780af321542ec05c4316798a72480e5a5da8cc
parent 2e3be621b670313f65867edf596e6f30ca3dd4b9
author Bill Yi <byi@google.com> 1505595953 +0000
committer android-build-merger <android-build-merger@google.com> 1505595953 +0000

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: ba3347b48a  -s ours
am: 2e3be621b6  -s ours

Change-Id: I090819b1cae93821cb2b9a135a511724813ed724