tree c6fe296fbe90746edd30a1713fbb835e67611efc
parent ec9c8d0b4c759f1079a5a6cb42055cff826875df
parent 79a231ae945f8ff8347064838349d191fb0e153b
author Bill Yi <byi@google.com> 1564177601 -0700
committer android-build-merger <android-build-merger@google.com> 1564177601 -0700

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

Change-Id: I9bb5ac68b5efcaf02e35ecb8546b41fc2a324d2c