tree c6fe296fbe90746edd30a1713fbb835e67611efc
parent 686cba6b673089adc779ed192715639213e892f3
parent 28255edbf898f5ad05dd300548b7bce34507d99b
author Bill Yi <byi@google.com> 1564178200 -0700
committer android-build-merger <android-build-merger@google.com> 1564178200 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 7af5bede6d -s ours am: f26bcb1967 -s ours
am: 28255edbf8 -s ours
am skip reason: subject contains skip directive

Change-Id: I47fa7438ad839c4e73a4e28e27946b76fa3c6708