| commit | 2adb9f1206513910caab8bcfaeea0891792ce755 | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Tue Mar 16 03:50:00 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 16 03:50:00 2021 +0000 |
| tree | ac1619184de9b1e9fba56ae6c555447d6cf6e44a | |
| parent | a2a4fd0767694f00bc6e3c2f3abc6432decbdedc [diff] | |
| parent | 16763614c0fe0cd8c25bd422f7370596cc4bb2fa [diff] |
[automerger skipped] Merge changes from topic "conn_resources_cp" am: 016e0b9261 am: 16763614c0 -s ours am skip reason: Change-Id Ic2491f04880ff66abc3b2d3aaee6168e18f6d68a with SHA-1 50caf56267 is in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1635019 Change-Id: Ib42d908a0136b5694f44c68ac1e58bd304dd0e5c