tree 6739395c78ad8fb90cb1a207bfcb83e9ed910a0d
parent c0a2649896691215420438bae1519955c69636c1
parent ae561ffba9bbc9bd74c39fd859ca9e38fdd4f4bf
author Bill Yi <byi@google.com> 1556322013 -0700
committer android-build-merger <android-build-merger@google.com> 1556322013 -0700

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

Change-Id: I59e9a260eb0e2d0fac9fb438e4dbf0784cfa7ff5