| commit | f633e57b26279eb1841abfb0938356d21339066b | [log] [tgz] |
|---|---|---|
| author | Etan Cohen <etancohen@google.com> | Wed Oct 05 05:29:00 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 05 05:29:00 2016 +0000 |
| tree | 1761d8e63e6ca0179222afb861e209c9922c23c3 | |
| parent | 0bcb437677e3aec919c14c5cbb1975c210a8e9d0 [diff] | |
| parent | 6619d5b545d0980c4263a51a3b278b268fb92825 [diff] |
Merge "[NAN] Use NAN capability information to validate configurations" am: 141a2840e1 am: 6619d5b545 Change-Id: Ied61c54b053a6ffe8ca9f14c43630d82f356dfa2