tree 3bf930b1dd5388bfcc9962a9328b868f9808c1bd
parent 5870a69127677b431bdf0c286e01dad81b0158df
parent fa8c4e0bc6173aefcd1d1305c0accd750bd37a11
author Xin Li <delphij@google.com> 1599789767 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599789767 +0000

[automerger skipped] Merge Android R am: aca6097e51 -s ours am: fa8c4e0bc6 -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: I2be9582a1c88a6f44f8c420e039cc61d5250a768