| commit | 624951463c7fa9e548ab51a0344bbd485cafc80f | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 15 17:00:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 15 17:00:07 2015 +0000 |
| tree | 5dc009d6ac1a4d64f86f81e3295a3230f15ce046 | |
| parent | f4efe32775207f1f47e2ee21686b9a0aed777894 [diff] | |
| parent | 1840edcd80a4bc62bae117848ef64a5c4bf83ef2 [diff] |
am 1840edcd: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev * commit '1840edcd80a4bc62bae117848ef64a5c4bf83ef2': Accept more than one SD in NsdManagerTest