tree 5e2f8a529be3bd03c79794b86ecca0dcfb4f58ab
parent d1eaac2bc02f089f6ec46193f0aa676c15b1a61d
parent 75dfa14c8277f6e7d592061e2bb7e2b283015a63
author Daniel Xie <dxie@google.com> 1433289544 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433289544 +0000

am 75dfa14c: am ef6c0b98: am be5ae9fb: am 1d06566c: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev automerge: 97fa3a2

* commit '75dfa14c8277f6e7d592061e2bb7e2b283015a63':
  Accept more than one SD in NsdManagerTest