tree cd5c608c0f74af2ee99056456764574f857a340d
parent 46ecbc897c60c2f92d170173fdb75b78d734b157
parent d0052c30cef1202fff6bb0f87d64eddb98cfbc99
author Bill Yi <byi@google.com> 1555539562 -0700
committer android-build-merger <android-build-merger@google.com> 1555539562 -0700

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

Change-Id: I6f80b1be7b7f0ab1046b1d65e1110de4a093cc83