Merge "[NAN-AWARE] Rename NAN to Aware [DO NOT MERGE] am: a61b9fb569 -s ours"
This commit is contained in:
committed by
Android (Google) Code Review
commit
17d807b75d