| commit | 9e360d16b5676ec7eaba92a6147b5ee676c8e4ee | [log] [tgz] |
|---|---|---|
| author | Victor Chang <vichang@google.com> | Tue Jun 29 08:57:35 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 29 08:57:35 2021 +0000 |
| tree | 621244c9209312d11066a24d1919f0f46b15572e | |
| parent | d8e431c45db54ba8563d2f01a521f924603de0f7 [diff] | |
| parent | 25b288225b800be5215aa47df45a2c342f5f9878 [diff] |
[automerger skipped] Merge "Partial cherry-pick to remove IoUtils#deleteContents usage in FrameworksNetTests" into sc-dev am: e4132c8ca0 am: 25b288225b -s ours am skip reason: Merged-In I5366e1cc9cd6ddb41f24718246381cc2b1cc1383 with SHA-1 fe20e1317d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15108481 Change-Id: I10f2769796cc170c3c3159a91d7a70cf253adac3