| commit | 4ed49913f693584687a9e568a39cb5c0530ed3b0 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Oct 19 23:54:51 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 19 23:54:51 2023 +0000 |
| tree | f5c6a2e23df512ee60f810a84d348583bc7e5f98 | |
| parent | 139c4b78ad16df223b90e265793c51d9393daaf4 [diff] | |
| parent | 87eaafd4046f9fd6646159cda4a8f30877971c1d [diff] |
[automerger skipped] Merge 10952656 am: 2c84071cec -s ours am: 87eaafd404 -s ours am skip reason: Merged-In I7dd3e12e549228223ed8c8aac71e6d1faf94f487 with SHA-1 4cfb32a63e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/25093162 Change-Id: Ifb2690cb66e22d48444272d98c1d2242e43dfa05 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>