tree c7dc6ee2111cace269c58bc2316a45272fa12316
parent 93cc10ac81f4a09cebd3123be7130bd3b175aa8e
parent e21e19ec4d280e041bed37a435827c52f2c4b46b
author Jimmy Chen <jimmycmchen@google.com> 1571379553 -0700
committer android-build-merger <android-build-merger@google.com> 1571379553 -0700

Merge "p2p: mirgrate p2p into tethering modes" am: 8a9a9adaeb am: 58d08de0c6
am: e21e19ec4d

Change-Id: Ida50dff8604243871d3f93258ea75b45ae25877c