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