| commit | 3b7703ee23df49c3c368a4270304d2ae52a6e455 | [log] [tgz] |
|---|---|---|
| author | Etan Cohen <etancohen@google.com> | Thu Oct 06 04:59:23 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Oct 06 04:59:23 2016 +0000 |
| tree | 28293017b43abce6f5bd91b473f1296bbc9bfa78 | |
| parent | 95fad688c31121aa100d6092531a3bd6c69eb05d [diff] | |
| parent | 84b7932077ece65f702d77614f168c256f5684cc [diff] |
Merge "[NAN] Expose NAN characteristics as an API" am: f12c6e4f5e am: b5d18a6b11 am: 84b7932077 Change-Id: I3b7366e623b8b97b57bd73fdd618033f79225a5e