| commit | 75ffc557a6acd53d262e852cfea0a7ce52680551 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Fri Jun 05 02:18:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 05 02:18:47 2015 +0000 |
| tree | 645875a92c9bc6e21b16ba355d472dc874edfbd2 | |
| parent | a3b3c8b5dfd7d94dadc5079a94d3479667a0772c [diff] | |
| parent | 3557697903ccd7058d4ff45e48d756247823edc4 [diff] |
am 35576979: am 93f50313: am 75dfa14c: am ef6c0b98: am be5ae9fb: am 1d06566c: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev automerge: 97fa3a2 * commit '3557697903ccd7058d4ff45e48d756247823edc4': Accept more than one SD in NsdManagerTest