tree 77749c8702c04c83f49bf409d8b8b93ba947eb41
parent 1f13fc13153a2d6ab3f16d5073084a9fa5998552
parent aca6097e512fe2b83d03724d851dcc038129db58
author Xin Li <delphij@google.com> 1599784824 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599784824 +0000

[automerger skipped] Merge Android R am: aca6097e51 -s ours

am skip reason: Change-Id Icd95435cfc24a66d9b6da41ccd2b996f34f03a28 with SHA-1 1f13fc1315 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/1422461

Change-Id: I0d8cc2e1f82dd57a5615ad09ebf8e3215ab089fe