| commit | 762d111509a0daba5f19cf1af8411a38684507e1 | [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 | 12b98f43e4c2c39d63515f2dd834b41d0003cfce | |
| parent | 08d039bc85b677a6c3c1df42c810d0acae98f64e [diff] | |
| parent | 95c409064828483914335222f165d8fadc75dffb [diff] |
am be5ae9fb: am 95c40906: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev automerge: 1840edc * commit 'be5ae9fb0797e754f6e5ca8a5a91ab867e455cb7': Accept more than one SD in NsdManagerTest