tree 683a79488c53c5c50aee7b29a83014f895bd3f9e
parent 7c1e5c711dcd59c5c974a3c85edc042f0596bd07
parent 69f5d8752ff18772b26401a10568886c072f52f2
author Xin Li <delphij@google.com> 1606969521 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606969521 +0000

[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 69f5d8752f -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: Iea1b6eaa9e21ff5f3c95475c69829ddf04865f81