tree 733cbba744972da2205feef488243be06795dbf9
parent fd55f834c804f239bd0f8b0683e9bfee18550442
parent 834a87d52501e49289299d21a31dfe890fd84f93
author Etan Cohen <etancohen@google.com> 1483813231 +0000
committer android-build-merger <android-build-merger@google.com> 1483813231 +0000

Merge "[AWARE] Simplify Wi-Fi Aware API namespace"
am: 834a87d525

Change-Id: I243194a658ee8e9c5a21301601a473149eaa8a2f