commit | 04c7ac4727223649197b883eb1177a6f94ca306b | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 01:47:59 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 01:47:59 2021 +0000 |
tree | 577368f3161c55faf97587d1be07cc0acaf70e9b | |
parent | d6dee71740529724c23cb090be56506c618ead0c [diff] | |
parent | 0d63d026fbfebd150470dff7d2f3d2bdcef956e4 [diff] |
[automerger skipped] Merge Android 12 am: 301d6bdfa6 -s ours am: 0d63d026fb -s ours am skip reason: Merged-In I3ae21d9b034e455ba48d9576712a102ccda0f647 with SHA-1 6e1c375f50 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1847635 Change-Id: Ic1f2771cc85ebe509c905e8448fd2982fd640b5d