| commit | 5f63d2ab1e620deb8a600b0817ba06f1e8d0fffd | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Thu Jun 24 10:57:59 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 24 10:57:59 2021 +0000 |
| tree | af179f08cc49b46d895ea38f657b6de848a2871c | |
| parent | a0a61c5e1deaa0a06fe3501986b3acc735c7d729 [diff] | |
| parent | cf7235f70655f47aedd21625575211f03b2f7f93 [diff] |
[automerger skipped] Merge changes from topic "sp31" am: a6cb322d00 am: cf7235f706 -s ours am skip reason: Merged-In Ie49461694d77ab7f25a549433b01b5b0167bd489 with SHA-1 a36f33ef90 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1626082 Change-Id: Ief7c84007da4563c2fda043c529cb3a673278064