tree 5f8a0859e4f3c78ab1202817a52b3e2a67f0ed93
parent 425a0fdc95f2f3105ab2677a7fb469d5b19d8a78
parent dfe8f5dc13f39b87ac6107c1a3b24db9b601597b
author Etan Cohen <etancohen@google.com> 1484176336 +0000
committer android-build-merger <android-build-merger@google.com> 1484176336 +0000

Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)"
am: dfe8f5dc13

Change-Id: I581b72ce62966f4c04427603a2b9686dcf46cc42