| commit | 23c8e1345cb108904b9012bca5b258c310cb2521 | [log] [tgz] |
|---|---|---|
| author | Etan Cohen <etancohen@google.com> | Sun Nov 06 03:29:53 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sun Nov 06 03:29:53 2016 +0000 |
| tree | 7157e01bdcd7c4f898b724f953b266ec8a5cd537 | |
| parent | abffee11a82eebbb825c759067ea76f604a8dc7c [diff] | |
| parent | 53cb11bcdc96f0b4f390be9d43da903718e93a3d [diff] |
Merge "[NAN-AWARE] Rename NAN to Aware" am: ab180e53b9 am: 3aa7f61eba am: 53cb11bcdc Change-Id: Iec7bfcf8d55a6735d43630686dc2e4a8b4d8c895