tree 13f4a3881fc99fd0050781e1dc3962d5da6789a1
parent c3bbc6d3ea08909bab163d0c5bb1914b5378bbca
parent 85d2768300f906beeb070dbc73a5fc845d398879
author Xin Li <delphij@google.com> 1648954071 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1648954071 +0000

[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 715bfe63d7 -s ours am: 85d2768300 -s ours

am skip reason: Merged-In Ia135d491ac5331ea8067fe7f64ad28df5c8eadb9 with SHA-1 f652fc08a3 is already in history

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

Change-Id: Ic6915d38e9c866712ecae5f24f46b46ca71a7000
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>