| commit | 7e78a0e3ae4c5b17a8fd3cb7f8bb8923f9f3d10f | [log] [tgz] |
|---|---|---|
| author | Etan Cohen <etancohen@google.com> | Thu Oct 06 05:04:51 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Oct 06 05:04:51 2016 +0000 |
| tree | cfca4429e6a4a7ebc014e56443d6b6c4d249cdf9 | |
| parent | 96951520f043dcb15c685df98806333e5034955a [diff] | |
| parent | 3b7703ee23df49c3c368a4270304d2ae52a6e455 [diff] |
Merge "[NAN] Expose NAN characteristics as an API" am: f12c6e4f5e am: b5d18a6b11 am: 84b7932077 am: 3b7703ee23 Change-Id: If1addbc02547f017548bd50a035babe03a86310f