| commit | 19bab012d9e1206631c1bca047b3e8fdda4a702a | [log] [tgz] |
|---|---|---|
| author | Etan Cohen <etancohen@google.com> | Wed Oct 05 22:52:58 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 05 22:52:58 2016 +0000 |
| tree | 2a0de50de4c75dfd1d35763308b6bac4f3763f33 | |
| parent | 552645eba2816fe5153c55b737e185e29a0fe36c [diff] | |
| parent | 3a6a9a441f33309afb9cf73e813ea3981e311981 [diff] |
Merge "[NAN] Use NAN capability information to validate configurations" am: 141a2840e1 am: 6619d5b545 am: f633e57b26 am: 3a6a9a441f Change-Id: Iae08a3e996ce7813058b2b127527a6976d35180e