tree 909e7b4d3be0583a813ed145952fb215f344f3db
parent d6554f6a174bc634af14a6884efafba1cb1cdb3b
parent 0140392dabee22a6f0c54d5cf2ba3e131b84456c
author Bill Yi <byi@google.com> 1561527986 -0700
committer android-build-merger <android-build-merger@google.com> 1561527986 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 0517d3d5e5 -s ours am: 5a98f2fd65 -s ours
am: 0140392dab -s ours
am skip reason: subject contains skip directive

Change-Id: Iabd591e94016e0dfaf770f2f66df065c1541ce6e