| commit | b5ae33c2eb497af419ec9027874a6bafa01fece8 | [log] [tgz] |
|---|---|---|
| author | Etan Cohen <etancohen@google.com> | Sun Nov 06 03:38:32 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sun Nov 06 03:38:32 2016 +0000 |
| tree | 5540f44d3d5fb44b34259b1dffce49dfef3e132f | |
| parent | f3e98625159fb5a350d1e8a2542796cd5f5a3a1e [diff] | |
| parent | 23c8e1345cb108904b9012bca5b258c310cb2521 [diff] |
Merge "[NAN-AWARE] Rename NAN to Aware" am: ab180e53b9 am: 3aa7f61eba am: 53cb11bcdc am: 23c8e1345c -s ours Change-Id: I214f10149fc5656b20c58689142558af225ac33d