| commit | 836744eac6d4bc918b9c6c3a30532ea44ae64c6d | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Mon Jun 07 14:17:18 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 07 14:17:18 2021 +0000 |
| tree | bffe1ef4ebde270683df6c9cd80679808152d9b5 | |
| parent | 63156a7150572c1d3f436536d3e21590e7ce4a22 [diff] | |
| parent | 7b037ab17a33acd56b114f6f682e2178771a0444 [diff] |
[automerger skipped] Merge changes from topics "ns-05", "ns02" am: d4f61e7ae2 am: d1203c206e -s ours am skip reason: Merged-In I6ec7b49bef74b030687c16bce14c2522431018ab with SHA-1 7f0205db30 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1558519 Change-Id: Ia0632a7e6d85ea1a4b462abaed16a3b1e2a3f955