tree abe7925527826adad223bba09a549edf100ee7eb
parent af60d7f8b5535ddb3a365ba956dd9638003c2218
parent c7d90451058efc1ffb8c58d2f3cf8798f0bb3657
author Bill Yi <byi@google.com> 1511216839 +0000
committer android-build-merger <android-build-merger@google.com> 1511216839 +0000

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

Change-Id: I4e65a2c460b3bcfa2e258a2952677b16d89e4d85