| commit | 5d36cf0fab8e864b92afd78cefbf575528c0a80b | [log] [tgz] |
|---|---|---|
| author | Vinit Deshpande <vinitd@google.com> | Wed Feb 04 02:17:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 04 02:17:49 2015 +0000 |
| tree | f27ac3d127175268c5fa9bad200126b5179988e6 | |
| parent | 3bccb60be8f7fb639ba69f667b5d8559bed96680 [diff] | |
| parent | d4c7a6b848997e290c02ce01059fcf01ee778aab [diff] |
am d4c7a6b8: Merge "Accept more than one SD in NsdManagerTest" * commit 'd4c7a6b848997e290c02ce01059fcf01ee778aab': Accept more than one SD in NsdManagerTest