OSDN Git Service

Merge "[NAN-AWARE] Rename NAN to Aware" am: 74b1131cc8 am: 6571007101
authorEtan Cohen <etancohen@google.com>
Sun, 6 Nov 2016 03:29:40 +0000 (03:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 6 Nov 2016 03:29:40 +0000 (03:29 +0000)
commit2ad6b14d5060763653b2937bb4a5855064f24999
treecc5770df87c1e8339c268b8f7432a56e157e2571
parentcc65f0761d44068c82ade446e8d093476570db2f
parenta99a05982e181f079c0cdb63f753f1677bc55b4a
Merge "[NAN-AWARE] Rename NAN to Aware" am: 74b1131cc8 am: 6571007101
am: a99a05982e

Change-Id: I8df580e15770c54ab3f0da3e3ff97165939719df