tree 162aa76ce1ac88a2a386b0b826c5b850a869c82e
parent 8299c94b4346f0511f0e1d5837d1b406e21b5001
parent faa25e50f217a4412b382a113c14ca02d586085c
author Daniel Xie <dxie@google.com> 1442543489 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442543489 +0000

am faa25e50: am 662de492: am 62495146: am 1840edcd: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev

* commit 'faa25e50f217a4412b382a113c14ca02d586085c':