tree cdcaee1479e79ca49f484252066025cc35ec9d0b
parent ae327fbca7069fed6d42952a38f04e15b4e0ba92
parent 6ae230f5773a0df542f3e15b0e2ef9f4f0bdfec2
author Bill Yi <byi@google.com> 1555559512 -0700
committer android-build-merger <android-build-merger@google.com> 1555559512 -0700

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

Change-Id: I8bb7d4fa2202434b1e6ecdcde6874bfdb81133ca