Merge "[NAN-AWARE] Rename NAN to Aware" am: 6c75254555 am: 4ddc6321ef am: 9f1b6c3da9

am: 2ad6b14d50  -s ours

Change-Id: Id51e99533ce8ab29bd40170f8eafc0f9702c16fb
This commit is contained in:
Etan Cohen
2016-11-06 03:38:18 +00:00
committed by android-build-merger

Diff Content Not Available