tree bc97f78bb750ace411739bb741823843b5f61990
parent 94b21d36119d75a38127f1e99c6adb5095a1bd47
parent 9628dbf4e179aaa21b591e940dc3890a027e6c87
author Bill Yi <byi@google.com> 1561075168 -0700
committer android-build-merger <android-build-merger@google.com> 1561075168 -0700

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

Change-Id: I1df4d0a8ce474d17a9f4a919a57de00cd1a9f932