tree e5b3d459a89541205e78e1b4327829618e6be02a
parent f401e087473f37562fa7dbc56a3d8c49de8d4d66
parent 553d451a3d75f70ef8eb5996222532c9312697ae
author Glen Kuhne <kuh@google.com> 1495233699 +0000
committer android-build-merger <android-build-merger@google.com> 1495233699 +0000

Merge "P2P: Fix hidl service discovery request" into oc-dev
am: 553d451a3d

Change-Id: I46c61ae1be6b8ff0cfe10a9eb224d917d675cf32