| commit | 08c82652e5be29006d817c6b5d767d8c7ee9d129 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Aug 17 19:46:05 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 17 19:46:05 2021 +0000 |
| tree | 8dc469e64364fb85fbfbfebe72e96676963beb43 | |
| parent | 4ccc949e26b64bc559040b6ae4e5a42cae097957 [diff] | |
| parent | 50f85b30981a80eba0549533024d2e4669354847 [diff] |
[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 3adc0a1fb0 -s ours am: 50f85b3098 -s ours am skip reason: Merged-In I982bdc04ad210f7055f46fa1c5e6e7fe07212dd0 with SHA-1 4ccc949e26 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/tv/tvsystem/+/15571840 Change-Id: Iefa4cdc3ac11d15c5830ffbc8fedab4ed8669832