tree ced2139b0deb2d55ee13f0c9ce617cd98aecbd26
parent 574be93b31c08bc453113aa755da1ee261b8fd54
parent b5023aad76bab9ad3620b1d6cca468c4d87d19a5
author Bill Yi <byi@google.com> 1599200225 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599200225 +0000

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d37fe4024 -s ours am: b5023aad76 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/device/google/atv/+/1419656

Change-Id: I2a810a07ba2da0bf437e56d663dc10c88f1d57a2