| commit | 95d7fb57fd9506098ea6e1ee52a6a1ff6e281002 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 15 17:00:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 15 17:00:07 2015 +0000 |
| tree | a649443dd4a9a549b40da0cd32f89fda200d08cd | |
| parent | 8d782e4e6b3185bb9d93f2b98b0b1ce3e575ada3 [diff] | |
| parent | 97fa3a23cc92cab1de23efb80f5253fa8106dc8c [diff] |
am 97fa3a23: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev * commit '97fa3a23cc92cab1de23efb80f5253fa8106dc8c': Accept more than one SD in NsdManagerTest