commit | bcd832e651b89e59fb4d61b3e4fea5ce4e9f759f | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Dec 14 21:24:04 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 14 21:24:04 2021 +0000 |
tree | eefdb23a45faa3152261b637f19b29ede85b140d | |
parent | 7bf5e7e325d3dd330a2135ce021bc67f06390966 [diff] | |
parent | 781839dd40e4d61d2ca0f2966c67e3288dde9e01 [diff] |
[automerger skipped] Merge "Merge Android 12 QPR1" am: 93c578c7ca -s ours am: 781839dd40 -s ours am skip reason: Merged-In I4bfb3fc34f10d0c84dafc949f4e7f604d98244e1 with SHA-1 d109712194 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1921898 Change-Id: I1cc7f055633ca98b54d3ecdb87b45a3609459a5e