| commit | 1d06566c8703b57f22a13cf4e8b1d3cd680975df | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Jun 02 23:18:57 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 02 23:18:57 2015 +0000 |
| tree | 4f54d432b56d88fe99bf40980548cbe64b69a5e5 | |
| parent | 43b1b9307466087ee48a8990be37a9d37f8408e2 [diff] | |
| parent | 97fa3a23cc92cab1de23efb80f5253fa8106dc8c [diff] |
Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev automerge: 97fa3a2 * commit '97fa3a23cc92cab1de23efb80f5253fa8106dc8c': Accept more than one SD in NsdManagerTest