| commit | 91d15466cefc308773963707eeaff790d0a0ab9b | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Aug 13 21:20:27 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 13 21:20:27 2021 +0000 |
| tree | 389d5f648f0e28282ce9b077d1c0ff513f88b78c | |
| parent | d603e2640042096aa7ba24669ad05ce3b0cbebdd [diff] | |
| parent | d46b36d3f1f30be7e7aa1dea133b55d9695dd83c [diff] |
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: a44df5f931 -s ours am: d46b36d3f1 -s ours am skip reason: Merged-In I14e544285d4096c404e33b79bc877836210523db with SHA-1 95c9d40c5b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/netd/+/15550182 Change-Id: I1de1f99f112166c0f2fe40f462ee518f0adf234e