tree b8a299aa64aa9fb40645f8f292115aecb9e3118b
parent 0b37d21e1f60ef1c587cc97780d48c3174a54e12
parent b199795653383c61a668056e1ecb1e30630a943c
author Chalard Jean <jchalard@google.com> 1560785305 -0700
committer android-build-merger <android-build-merger@google.com> 1560785305 -0700

Merge "Remove the <= P restriction for WIFI_P2P" am: 4e8973e9a8 am: bb754c9c8d
am: b199795653

Change-Id: I56e16f7a29f20e4ebbbcef2228fc2935b41df564