tree 3ed3f8b1f523f95232b88dca8b5a59d3175a054f
parent 20ae6826e8d1fed4a5faa335f24c92b72e19b58d
parent bb9d555305570d7a9ddd1b0dfd53e4ee8d7077b9
author Bill Yi <byi@google.com> 1570817844 -0700
committer android-build-merger <android-build-merger@google.com> 1570817844 -0700

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

Change-Id: Ibc5eac1dcc31f89424644f8ce3bcf57481313d1e