tree 4b133b56dd8cf57880e9f13347f07bce6c558fe7
parent 1d06e0b1fbd6916defb9aae19466d81588c4355f
parent baf9025bbf9644f7ee850da389bcf2e63aee1773
author Jimmy Chen <jimmycmchen@google.com> 1571378764 -0700
committer android-build-merger <android-build-merger@google.com> 1571378764 -0700

Merge "p2p: mirgrate p2p into tethering modes"
am: baf9025bbf

Change-Id: Ib8f43d77a5f57965fa217e6e92eb9773e7914b54