tree cd873dbafd957bc2a2d793353f71fa0e10053b30
parent a84ff68c299e23922a44dc4875edc29f8a1a4c02
parent 93f50313d896736943e1d68f3aba57b3413e054e
author Daniel Xie <dxie@google.com> 1433290076 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433290076 +0000

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