tree fd7f7affec11be71600991fa3f09d04ca8c5530d
parent 493f8b7b69efffdb0c6d36a71d0c40cda3788fbd
parent b537c256850ca7d60860350c6b81d522bbf8eae0
author Mark Chien <markchien@google.com> 1596609396 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596609396 +0000

Merge "Allow wifi p2p to use legacy dedicated address" am: d2af4d9e2a am: b537c25685

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382398

Change-Id: Ica17499f82135bc96b87ca4071b603bb8cc23053