| commit | 883461a6d42df1b99549f547ffa937c5d4da1753 | [log] [tgz] |
|---|---|---|
| author | Etan Cohen <etancohen@google.com> | Sun Nov 06 03:38:18 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sun Nov 06 03:38:18 2016 +0000 |
| tree | 73c4cc55312cd9bd86e7f57e9032d8ae98ebbd08 | |
| parent | 3a1dd86ce48533055b062364a2bd567a259abf71 [diff] | |
| parent | 2ad6b14d5060763653b2937bb4a5855064f24999 [diff] |
Merge "[NAN-AWARE] Rename NAN to Aware" am: 74b1131cc8 am: 6571007101 am: a99a05982e am: 2ad6b14d50 -s ours Change-Id: Id51e99533ce8ab29bd40170f8eafc0f9702c16fb