| commit | d781d8a61d3d28d93fbf91794cc821fc733d5118 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Sun Sep 20 01:35:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Sep 20 01:35:56 2015 +0000 |
| tree | 48221ce2737261b73bb445df385c42dd21e5df0b | |
| parent | 024ce01bc6e2d1fbd64fc52d6de2bd528b5925d3 [diff] | |
| parent | e0adef11b63a3c50341e98f0c21b60d7f36b3d5f [diff] |
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 'e0adef11b63a3c50341e98f0c21b60d7f36b3d5f':