| commit | 2ad6b14d5060763653b2937bb4a5855064f24999 | [log] [tgz] |
|---|---|---|
| author | Etan Cohen <etancohen@google.com> | Sun Nov 06 03:29:40 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sun Nov 06 03:29:40 2016 +0000 |
| tree | cc5770df87c1e8339c268b8f7432a56e157e2571 | |
| parent | cc65f0761d44068c82ade446e8d093476570db2f [diff] | |
| parent | a99a05982e181f079c0cdb63f753f1677bc55b4a [diff] |
Merge "[NAN-AWARE] Rename NAN to Aware" am: 74b1131cc8 am: 6571007101 am: a99a05982e Change-Id: I8df580e15770c54ab3f0da3e3ff97165939719df