tree 8c3db70c6823534b4e3c15948b030a17a5bc04a2
parent b1283460a2304d74880edfce3cc2481ce0c0893f
parent 6f52cfc821550b19149916fad217bba4826e8db8
author Bill Yi <byi@google.com> 1527275262 -0700
committer android-build-merger <android-build-merger@google.com> 1527275262 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 6f52cfc821  -s ours

Change-Id: Ie9432dc64b559b374b19eeeb935f7ef7068c1ab3