tree f4807a1d5e169667b00547b9554287ee43bd12c4
parent db178f00d6ab32aa2221000861b0bfc195eb7c91
parent 79153e7edf2a9418d6632ba7f96d24bc94035bd6
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582561513 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582561513 +0000

[automerger skipped] Merge "Merge "wifi: correct API name" into rvc-dev am: 14ebab3b19 am: 2107484d95" into rvc-d1-dev-plus-aosp am: 658f57d1cc -s ours am: 79153e7edf -s ours
am skip reason: Change-Id I3bcbcfd04dced36b63436b5a96835fb0d8f35f3b with SHA-1 7a0c18c884 is in history

Change-Id: I544c619c80dc3ca7e5de97e6fe2881e9079daac3