commit | 55ad3ce652c0e3e98b6e29b2bd1b4f95e0373a9c | [log] [tgz] |
---|---|---|
author | Xiao Ma <xiaom@google.com> | Tue Jan 19 05:21:16 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 19 05:21:16 2021 +0000 |
tree | 53782969ddffc19b9e59bc24aa2cb1b15e71b8d0 | |
parent | dbd5053f5629d56b84ccb3908a13e14a234f37d6 [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: Ic48799470ce7b33d330ad4d94a31d15618739b21