tree 91612589483dba25c52ced558442a34394b10ab4
parent 6e96950a3701a2c8cb4128ea446b7ced9bd6d0f5
parent 66c8f60eb7883b0515395e14e49dfd3274ebcfa7
author Bill Yi <byi@google.com> 1497303143 +0000
committer android-build-merger <android-build-merger@google.com> 1497303143 +0000

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 66c8f60eb7  -s ours

Change-Id: I16ea34198d95d7da16a3a07cf0da1aa9b2b3304e