commit | eaa34bb268476df4e84088cc72076ecee4ede007 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Aug 17 20:32:29 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 17 20:32:29 2021 +0000 |
tree | 5f18b1de597aa72651d1a5109bb9156861878406 | |
parent | 7f675bc8aaaf4d99255445ddc65b343b04b63073 [diff] | |
parent | b5e7b3086721d87437d44ad408308152da8ac150 [diff] |
[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: d4afc0d708 -s ours am: 7ff8d101ef -s ours am: b5e7b30867 -s ours am skip reason: Merged-In I2a4f5caa041f6b0e6f950e536ab74be71a5a2a53 with SHA-1 3ed5c3997b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/15571823 Change-Id: I202a0103890492bda0b99eaf46c512fdf73dab70