tree 6dec01bae8f1624af3aea01c135e56e9269c9496
parent f66042e2d0e05fba2fd4baae0a46494e8dad5d07
parent 00cced240d45aa92fc2937bb88a3a48999b62aec
author Bill Yi <byi@google.com> 1560496142 -0700
committer android-build-merger <android-build-merger@google.com> 1560496142 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 00cced240d -s ours
am skip reason: subject contains skip directive

Change-Id: I43d16ab9ca453633ff0aefd1b226c7b62a067052