tree 798f3fd4249139932bf1e96f96a2036e57da8bc2
parent 8b8c14c9407baf17e6bb2e1071d7d527393bf637
parent 579040481bce786aeca2d74aa02606ccfcab8533
author Bill Yi <byi@google.com> 1504129396 +0000
committer android-build-merger <android-build-merger@google.com> 1504129396 +0000

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

Change-Id: I38b81bad055650da23ac8b65ea0b4cba11382fa0