tree 6fafc8d3808f58228af53dc01514b3c6c89f62d7
parent 04f7602c32890febf35b61629ef13ebdf020127a
parent dde0e6ad21f41a55a7874273cf22807350ef6f64
author Etan Cohen <etancohen@google.com> 1500614398 +0000
committer android-build-merger <android-build-merger@google.com> 1500614398 +0000

Merge "[P2P] Public API to clean-up resources of P2P" into oc-mr1-dev
am: dde0e6ad21

Change-Id: Iaf93437093fe461d202918d187a89832b0b9ddbc