summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2023-12-11 22:57:51 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-12-11 22:57:51 +0000
commit422021bf5f90cfc827c1af16797586529ed9d17b (patch)
tree7e3c083eebe74808f74c03dc926ee3ff8d1810b2
parent85a0e6835b9f797fe4c521f30f416919d2edddff (diff)
parent5944674d8473c1ab5f7ec3224165c53e930ded6d (diff)
downloadTvSettings-422021bf5f90cfc827c1af16797586529ed9d17b.tar.gz
[automerger skipped] Merge Android 14 QPR1 am: ba410c01e3 -s ours am: f48d38cad0 -s ours am: 5944674d84 -s ours
am skip reason: Merged-In I270c2326c99fdd5caf2b9a6516ed978bdf0f6297 with SHA-1 bdabeeaa5e is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/2863533 Change-Id: Id6f7bcc0e5e756a0b725daab30314cac5cb6d31c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions