tree 08e991bb2a2f7ac92544024e8cde59f347a443e9
parent 9f4656b4d726c1d0c8dcaa85565fdb7f7627e521
parent 5f83b0c3ad798ae4113b79d3a0c2d75bc8700909
author Bill Yi <byi@google.com> 1568746109 -0700
committer android-build-merger <android-build-merger@google.com> 1568746109 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 8dda6713c0 -s ours
am: 5f83b0c3ad -s ours
am skip reason: subject contains skip directive

Change-Id: I8e3261007d892e9be41736d3a12e210896fdbe8b