Skip to content
Commit 968f5a96 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi" am: dda5e925 am: fe714618 

Change-Id: Ic2168f237508137de450833d9c4a8f7229d89090
parents dbefc5e6 fe714618
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment