OSDN Git Service

Merge "[NAN-AWARE] Rename NAN to Aware" am: ab180e53b9
authorEtan Cohen <etancohen@google.com>
Sun, 6 Nov 2016 03:21:54 +0000 (03:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 6 Nov 2016 03:21:54 +0000 (03:21 +0000)
commit53cb11bcdc96f0b4f390be9d43da903718e93a3d
treec967bee098f928ef4b3ee3ddeefa4fa023d6c57b
parent521f992ae8c5dd47b8139235ddd884a703880c4d
parent3aa7f61ebaa7397b35b945f6c987cb19034ff550
Merge "[NAN-AWARE] Rename NAN to Aware" am: ab180e53b9
am: 3aa7f61eba

Change-Id: I28cc8ef7a2589683fb16b9498ae1c2abfe2bf925