| commit | ad864c8fd9fc3d3c6caa01543bf655efa2e5c14a | [log] [tgz] |
|---|---|---|
| author | Etan Cohen <etancohen@google.com> | Tue Sep 20 16:58:32 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Sep 20 16:58:32 2016 +0000 |
| tree | 85d4db41c2247466d84721406fdaec6a6cefd9fc | |
| parent | 6d2cca0f43399c14190c76223644ee84996d4936 [diff] | |
| parent | eb4c838c469fc63e54ee4768bd90b7051f771c97 [diff] |
Merge "[NAN] Rename to make discovery explicit" am: 5706a8f535 am: eb4c838c46 Change-Id: Ie03f1e3fbead74c4de77758163ad911e68e54b90