| commit | a9549e4275c81a78338cb6d7729894d04b0cce27 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Mon Jun 14 06:03:47 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 14 06:03:47 2021 +0000 |
| tree | 9a27d5c5e7eec8e11acede9812c6558fc466b941 | |
| parent | 614299c2629076c5fd87042cb685bc5fb1368fdb [diff] | |
| parent | cd60e94a2cc8903dc8377382d85daea7bc004561 [diff] |
[automerger skipped] Merge changes I944f4c6a,I69cf58bc into sc-dev am: cd60e94a2c -s ours am skip reason: Merged-In I944f4c6ad36206bdccd85a6ea7ef71324a29c685 with SHA-1 b4bf015b57 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14935383 Change-Id: I49a1191f13e16e8c4cbea74cff913f03453168bd