| commit | 0b360958c2911af3ebae6f71060eef056b9c944a | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 01:19:50 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 01:19:50 2021 +0000 |
| tree | a66461f7acce88edd57bca73fa251c81719bec2a | |
| parent | 964911aeccf65b55084514d7539b10fdf75b8e71 [diff] | |
| parent | d4131013b5051874f2f7ede44437498d82bad207 [diff] |
[automerger skipped] Merge Android 12 am: d4131013b5 -s ours am skip reason: Merged-In I249f36c8b84b22b72786f0401fc0faa83ef90e4c with SHA-1 964911aecc is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/1847703 Change-Id: Ie8f183da1bedfa8db0c695d37ec929b30145860a