commit | 7a36073c1493db30c6458a99234c08dded1a4daa | [log] [tgz] |
---|---|---|
author | Etan Cohen <etancohen@google.com> | Wed Jan 11 23:28:20 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jan 11 23:28:20 2017 +0000 |
tree | bf7600d1d15f188b44d1341399d8a1deb8fc2061 | |
parent | 606bdfe503be17b10548d63668603c01ecf65eee [diff] | |
parent | 3fc5b186faea000a145a7ac57cd4b2d1e3c49b52 [diff] |
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13 am: 2a4e3bef2c am: b32dfa4ef5 am: 3fc5b186fa Change-Id: Ib668ed15ccf1f05c5ed31f700b69e1f3ab8b4cac