| commit | 61d8cffa7db175d5b0bc16d7c7b9555271266a5e | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Sun Sep 20 02:22:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Sep 20 02:22:13 2015 +0000 |
| tree | 6d130a6508234fa9bb680f796dbe77c113703c05 | |
| parent | de95223f871d9aec9be68dee3afc89d0c36be952 [diff] | |
| parent | ed0ad511e26b2604639bd146db9cfeca890ada90 [diff] |
am ed0ad511: 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 'ed0ad511e26b2604639bd146db9cfeca890ada90':