| commit | 744caa9f142768435ef40039aef854f061577a3c | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Mar 08 22:15:14 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 08 22:15:14 2022 +0000 |
| tree | 1ff2559ad8f355488d8165666daa5bcbede1e7cd | |
| parent | e2939f81d7c9b6af8fd0e18bad799937e834bf51 [diff] | |
| parent | dc0aa2e9bf389399d9006a7343fd7e49353e3593 [diff] |
[Resolved conflict] Merge "Merge Android 12L" am: e6953d54a5 am: dc0aa2e9bf Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/17116068 Change-Id: If24ad01491035c4995c99a1a189a82587dd5291e