tree 9472afe6732d15c42e7b0143664ac028f75792a2
parent bcd1d7f68821de7263e3f244a3a63669bd339b23
parent 968f5a9665d64aab7f9795938f3fa7c2a6d95a47
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579091639 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579091639 +0000

Merge "Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi" am: dda5e92547 am: fe7146187e am: 968f5a9665

Change-Id: Iece2ad4133751a8c258f64d7796158ffe90881ce