| commit | d2e884590de8910c37c1032e45db5e302a13d154 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Fri Jun 05 02:18:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 05 02:18:47 2015 +0000 |
| tree | 0d33a8705a4421f0dae25db988650ead5705b2f7 | |
| parent | b1f33d49d0cb0601ff633a5237b3ac4e23355e67 [diff] | |
| parent | 7f58cec67e4d914463c1d062eeda67f8509a4c9f [diff] |
am 35576979: am 93f50313: am 7f58cec6: am 762d1115: am be5ae9fb: am 95c40906: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev automerge: 1840edc * commit '3557697903ccd7058d4ff45e48d756247823edc4': Accept more than one SD in NsdManagerTest