| commit | e6338578bdb0f7bb3c2300e7258240682a185bc7 | [log] [tgz] |
|---|---|---|
| author | Etan Cohen <etancohen@google.com> | Wed Sep 21 05:42:24 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Sep 21 05:42:24 2016 +0000 |
| tree | dc2038da0106ddf974e434293524896b42a82218 | |
| parent | 3d25ec4479263237e322161be0dffe703678d395 [diff] | |
| parent | b7f1a665b53a8f79d81d718459fc44525b4766dd [diff] |
Merge "[NAN] Rename to make discovery explicit" am: 5706a8f535 am: eb4c838c46 am: ad864c8fd9 am: b7f1a665b5 Change-Id: Icfb2cc41125f14add10c2d8881d651c51c484b6c