tree 076faa5f76d50fbaaf3dcc41094bbd8598449690
parent 0c6b03d41b79d28b120df91806dc41f8024fdd40
parent 1d06566c8703b57f22a13cf4e8b1d3cd680975df
author Daniel Xie <dxie@google.com> 1433287615 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433287615 +0000

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

* commit '1d06566c8703b57f22a13cf4e8b1d3cd680975df':
  Accept more than one SD in NsdManagerTest