| commit | 695171b9f2fc684d9b9bf385933d73f0cd1e306e | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Mar 08 11:07:27 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 08 11:07:27 2022 +0000 |
| tree | 824f1539d9685297ec6de959e5211c0b832e3585 | |
| parent | 8b720efb2ece408076b487d6e3f622b525b696f7 [diff] | |
| parent | 0945458d9f3163b5aa7ef0077d102a0e76ce9fc9 [diff] |
[automerger skipped] Merge "Merge Android 12L" am: e6953d54a5 -s ours am: 0945458d9f -s ours am skip reason: Merged-In I03636e6b8b4dc200fcb039b99190759bc7d5e776 with SHA-1 3acad24476 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2013399 Change-Id: I01621dd9cf225b31150f0ef92ec9c91587b13348