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