commit | c14fd857ca6e357af1489d3c57a692c489c5451d | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Aug 13 21:03:07 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 13 21:03:07 2021 +0000 |
tree | 82dc47b28726912c8d1595c26bbf8a3de8dd805f | |
parent | 256a5b837db3c8ebc4580ba0f6494161f51b07b7 [diff] | |
parent | a44df5f931c3deb75bf0310d5c20121f63c498a8 [diff] |
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: a44df5f931 -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: I45a011c74091e914e9116bb267be3a51fc4cf6c7