tree 8ff147589bd7e750ac2913260b8d0b0b6e2d038d
parent 62f111d0b514ae129e57859da0708654751a4bf1
parent 2407f75c2e34d7b6970a00af39049d443d22f8ce
author Daniel Xie <dxie@google.com> 1433287079 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1433287079 +0000

Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev