| commit | 0da784c6946b801f29a064fe37bea549937d35f0 | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Tue Mar 16 07:11:13 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 16 07:11:13 2021 +0000 |
| tree | 61bcc184db4fd2a8348150b3fb0604038b45ef14 | |
| parent | c22057771c33de7c75452bc7c7d6eec36d5b3266 [diff] | |
| parent | 2adb9f1206513910caab8bcfaeea0891792ce755 [diff] |
[automerger skipped] Merge changes from topic "conn_resources_cp" am: 016e0b9261 am: 16763614c0 -s ours am: 2adb9f1206 -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: I6685aac76a7281bb8ce845d0f2b2b3fb1974ae5f