tree f89a4c2bd8e104d20b03958025de768e79deb4c8
parent 48d3a66c9e424aa7cce8009a9ccc94a97b0d86a5
parent 1840edcd80a4bc62bae117848ef64a5c4bf83ef2
author Daniel Xie <dxie@google.com> 1433287137 +0000
committer android-build-merger <android-build-merger@google.com> 1433287137 +0000

Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev
automerge: 1840edc

* commit '1840edcd80a4bc62bae117848ef64a5c4bf83ef2':
  Accept more than one SD in NsdManagerTest