| commit | 3557697903ccd7058d4ff45e48d756247823edc4 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Jun 03 00:07:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 03 00:07:56 2015 +0000 |
| tree | cd873dbafd957bc2a2d793353f71fa0e10053b30 | |
| parent | a84ff68c299e23922a44dc4875edc29f8a1a4c02 [diff] | |
| parent | 93f50313d896736943e1d68f3aba57b3413e054e [diff] |
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 '93f50313d896736943e1d68f3aba57b3413e054e': Accept more than one SD in NsdManagerTest