tree 6de9ab9927d07438c2b36f3eddcab5c9dc9dbf1c
parent 36f79afd3d95ce49f9b019e36d207a99444c80cd
parent ed6f2f533a6b19f3d83a604b0f2e4132b2393a7b
author Xin Li <delphij@google.com> 1606970381 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606970381 +0000

[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 69f5d8752f -s ours am: ed6f2f533a -s ours

am skip reason: Change-Id I0c15180497ffa67182a82adafe2f1002a567932c with SHA-1 66e4cbb73c is in history

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

Change-Id: I241a2513a2ad6dbcb1c89e88977bb265e6ec3c40