| commit | ef6c0b98d5713f58f6a2014d1e82ed4bc4057519 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Jun 02 23:35:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 02 23:35:11 2015 +0000 |
| tree | ee5421c43ce6260eb2b0eb4d612263fd784fef66 | |
| parent | 39bb0e6ba425705a4a339c965342120ac67a4c24 [diff] | |
| parent | be5ae9fb0797e754f6e5ca8a5a91ab867e455cb7 [diff] |
am be5ae9fb: am 1d06566c: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev automerge: 97fa3a2 * commit 'be5ae9fb0797e754f6e5ca8a5a91ab867e455cb7': Accept more than one SD in NsdManagerTest