| commit | 56dec6e04b86a8726d1193e0dbbe3e8df5f135c9 | [log] [tgz] |
|---|---|---|
| author | Etan Cohen <etancohen@google.com> | Wed Feb 24 18:19:28 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Feb 24 18:19:30 2016 +0000 |
| tree | f6c721c633c3ef540597fc6603eb459345129730 | |
| parent | 726bef092760acf612076dfcae1d8267aeb9b84e [diff] | |
| parent | e698fab45cd0544ba63a89a03ff8f32de49e8f1c [diff] |
Merge changes from topic 'api_clean' * changes: [NAN] API cleanup - rename FLAGS. [NAN] Renamed listeners to callback per API guidelines [NAN]: API update - consolidate Puslish|Subscribe Data+Subscribe -> Config NAN: Support multiple instantiation per UID - introduce a client ID.