| commit | 7fa90e74a1483951c95b35e4f3c42c30ea06e422 | [log] [tgz] |
|---|---|---|
| author | Paul Duffin <paulduffin@google.com> | Thu Jun 09 13:29:25 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 09 13:29:25 2022 +0000 |
| tree | d25a61d594d06faefe82d0b9505dc9fa714d7d35 | |
| parent | 77a6bf72045318eb72c7d8ff84aa897b9692bf3d [diff] | |
| parent | 5fc809f799737a5b770fb2cf7a00247add159c9b [diff] |
[automerger skipped] Workaround prebuilt name conflict for service-connectivity am: 5fc809f799 -s ours am skip reason: Merged-In Ib2fbd3c7703e9ed606650643db6e1977f550d90d with SHA-1 4ceb8c1f25 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2107608 Change-Id: Ibe4daff1b23143240bd577924158f7b185035aa5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>