| commit | 84b7932077ece65f702d77614f168c256f5684cc | [log] [tgz] |
|---|---|---|
| author | Etan Cohen <etancohen@google.com> | Thu Oct 06 04:55:16 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Oct 06 04:55:16 2016 +0000 |
| tree | ca5e5a25cec5f204204f05e3edd939700680c33b | |
| parent | 97b3d99577fdaf470d20632b7b2a8a49ced816da [diff] | |
| parent | b5d18a6b1196995bb1e5d4fed577140a1644fbbb [diff] |
Merge "[NAN] Expose NAN characteristics as an API" am: f12c6e4f5e am: b5d18a6b11 Change-Id: I4614dc5659753ee1bfc6276090a5d1d7e9b209a0