tree 2a54505836bf41f6fbe0801a79fb4fca05ae5b30
parent 95735cdae4d1d7a7f95e9b938839f17f727416bb
parent 4a4b0e572635ba4dde2ae327ebb72e2945fafb61
author Bill Yi <byi@google.com> 1499446055 +0000
committer android-build-merger <android-build-merger@google.com> 1499446055 +0000

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 2fb78bafc7  -s ours
am: 4a4b0e5726  -s ours

Change-Id: Ie1d846377804bec15366f3d2ae97e7dbcba3730f