commit | daa569a6e3ffac41fcc80bda0505f36f9c3cfb95 | [log] [tgz] |
---|---|---|
author | Lorenzo Colitti <lorenzo@google.com> | Tue Jun 15 17:34:45 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 15 17:34:45 2021 +0000 |
tree | ba739db2c9f21e124525de6c5ada15e60cf19c47 | |
parent | d3195fe2e73930f2ff3a21556416484f2c27308c [diff] | |
parent | 52832c76f0d1e0766a410f5623a74cb209ff1f99 [diff] |
[automerger skipped] Merge changes I3fffbf4a,If557b0a1 into sc-dev am: bba6383a73 -s ours am: 52832c76f0 -s ours am skip reason: Merged-In I3fffbf4a5dea68e61349de8b41bea49b8a319f86 with SHA-1 4425a6147c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14963613 Change-Id: I918fc385b407f29a23d44114b732034bf3ef92e3