| commit | e0adef11b63a3c50341e98f0c21b60d7f36b3d5f | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Sun Sep 20 00:16:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Sep 20 00:16:06 2015 +0000 |
| tree | 3024caa88cedc9f9eff427cd57ae2fe747721a0d | |
| parent | 1b00fadb5a0e22f7a724df167d3e1fa0d6a1c953 [diff] | |
| parent | c28e00cb1581e20559243c290b330fb97262b8c0 [diff] |
am c28e00cb: am faa25e50: am 662de492: am 62495146: am 1840edcd: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev * commit 'c28e00cb1581e20559243c290b330fb97262b8c0':