tree 79e8f303f0f02d283dc528630e6e9c599c476eb1
parent f4b7fdc51189770b00ac689f5b9e751235cc16b4
parent c5a1544b21a030dbd8f9395d7c6f04b6ee55b11c
author Bill Yi <byi@google.com> 1564782184 -0700
committer android-build-merger <android-build-merger@google.com> 1564782184 -0700

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

Change-Id: I99e1d40877f3174a83554e80bb298ba59ca12ffb