| commit | b7c8c42fb6fb78265f5178945dc13fd5f97b39f4 | [log] [tgz] |
|---|---|---|
| author | Xiao Ma <xiaom@google.com> | Tue Jan 19 05:23:17 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 19 05:23:17 2021 +0000 |
| tree | 53782969ddffc19b9e59bc24aa2cb1b15e71b8d0 | |
| parent | f0ff7f3baa8c4bff6e0c91e2308be70466ffaacf [diff] | |
| parent | 79c86823811791294aff7b60872f2cbd8d02a68d [diff] |
Merge changes I485e0bbc,I640f343d am: a95cfa14f9 am: 19fe87589b Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1536721 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0130ba9c8de64030978f028a7718904cd757fdc2