| commit | 1cf07598d0aaa8bc793bc01a2420da2f2ff8bf60 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 08:59:29 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 08:59:29 2021 +0000 |
| tree | 8dc469e64364fb85fbfbfebe72e96676963beb43 | |
| parent | 9ea168c8269ea2f1a960730d2f6ec3a416f02730 [diff] | |
| parent | 9e0bcbb40e841ded198e5f6e0c4b5b687bb343b7 [diff] |
[automerger skipped] Merge Android 12 am: 43c68b1644 -s ours am: 2f99765ff2 -s ours am: 9e93b8898d -s ours am: 39348c96b2 -s ours am: 9e0bcbb40e -s ours am skip reason: Merged-In I98a36fd3519bb6b7507ed0384c4c58ba220ae456 with SHA-1 3adc0a1fb0 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/tv/tvsystem/+/1847661 Change-Id: I0592ee3f67abdf6b6f360ca7138d42fcea5cc0b5