| commit | faa25e50f217a4412b382a113c14ca02d586085c | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Fri Sep 18 02:19:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 18 02:19:53 2015 +0000 |
| tree | 3a2dc36bc6652f9592fa077aba710bfc41767511 | |
| parent | a8dfc9acfe032ac10e398c1e809e61a1b00d26e4 [diff] | |
| parent | 662de4922d9f7436a806e1ee7eaee75b4096aa48 [diff] |
am 662de492: am 62495146: am 1840edcd: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev * commit '662de4922d9f7436a806e1ee7eaee75b4096aa48':