| commit | 7f58cec67e4d914463c1d062eeda67f8509a4c9f | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Jun 02 23:46:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 02 23:46:52 2015 +0000 |
| tree | d22bb094a3f7d3ddd5edcf29f9aa42df5589153a | |
| parent | cbdec383f28a9b11795b0fceab58c72cfac769ff [diff] | |
| parent | 762d111509a0daba5f19cf1af8411a38684507e1 [diff] |
am 762d1115: am be5ae9fb: am 95c40906: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev automerge: 1840edc * commit '762d111509a0daba5f19cf1af8411a38684507e1': Accept more than one SD in NsdManagerTest