tree 9779095e5a603526d44704c559c820d3628c5ea8
parent 2d7887bdd3183d2377d4844dd16c57f15dc6f4be
parent d781d8a61d3d28d93fbf91794cc821fc733d5118
author Daniel Xie <dxie@google.com> 1442715203 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442715203 +0000

am b50a7c58: am 7a21824b: am 9e975857: am d781d8a6: am e0adef11: am c28e00cb: am faa25e50: am 662de492: am 62495146: am 1840edcd: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev

* commit 'b50a7c584e380b1f173c8cdad2b2efaf382504e4':