tree 36d2155349dd0583e671c49a7497863c5bd93a8e
parent 77c67f506dad3380681c6dd2ae9d7cadcc8fa191
parent 1a47ff9f0899e29d949bc301d062e71cc769c26c
author Xin Li <delphij@google.com> 1633655999 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633655999 +0000

[automerger skipped] Merge Android 12 am: 1a47ff9f08 -s ours

am skip reason: Merged-In I304701a1ad5be47bec534d679eca259b06cb084d with SHA-1 77c67f506d is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1847600

Change-Id: I173b718a156ec9c8a4255aba9bdc13726be074eb