commit | e6a965bc602b0938dfd61a31ae59dc7c01bd3180 | [log] [tgz] |
---|---|---|
author | Remi NGUYEN VAN <reminv@google.com> | Tue Jun 08 09:56:48 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 08 09:56:48 2021 +0000 |
tree | a1327dc1e7e71a54e45d8ef745b972a3ca636830 | |
parent | cd4d78884edfe687dcaac1c0f500de66b33947c4 [diff] | |
parent | b6edc1a9b9b2dc3f3a4cf9c7b40ad93832657c06 [diff] |
[automerger skipped] Merge framework-connectivity impl and stub targets am: e70cd84601 am: b6edc1a9b9 -s ours am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723150 Change-Id: Ic5d6ddbc5bb5f47f54bac07975e15168548338e7