tree 4fb7e132ea636d6ea3f48771650eb3be8ba42844
parent c04ad32e7af6a99bff70079c1bf944afa80555a6
parent 2f8f5d8643266698289f9c6aee5b68ee3f1d59b1
author Jimmy Chen <jimmycmchen@google.com> 1590636505 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1590636505 +0000

Merge "p2p: check device capabilities before launching this app" am: f15d5b7741 am: acd0ad6ab9 am: 0b3c13c170 am: f413e47052 am: 2f8f5d8643

Change-Id: Ia782d33851bc28ce20b83ef5f9d1bd0f58d3479d