tree c967bee098f928ef4b3ee3ddeefa4fa023d6c57b
parent 521f992ae8c5dd47b8139235ddd884a703880c4d
parent 3aa7f61ebaa7397b35b945f6c987cb19034ff550
author Etan Cohen <etancohen@google.com> 1478402514 +0000
committer android-build-merger <android-build-merger@google.com> 1478402514 +0000

Merge "[NAN-AWARE] Rename NAN to Aware" am: ab180e53b9
am: 3aa7f61eba

Change-Id: I28cc8ef7a2589683fb16b9498ae1c2abfe2bf925