tree d6fe00995872650f74e0ec1b32d202e3e2182d3e
parent bdbc4162e34d270b09c7bfd5e6639fd2d8d6117c
parent 16ae0c8f866527b6bc5c54b8b944e6fe02f40092
author Etan Cohen <etancohen@google.com> 1489589452 +0000
committer android-build-merger <android-build-merger@google.com> 1489589452 +0000

Merge "[AWARE] Separate Aware (NAN) VTS tests into a separate test binary."
am: 16ae0c8f86

Change-Id: Ib18f8ad75e9e8dc687e755da705314b3e924599f