| commit | 08d039bc85b677a6c3c1df42c810d0acae98f64e | [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 | 12b98f43e4c2c39d63515f2dd834b41d0003cfce | |
| parent | 81914b44602724226e3f5db4e5f33cc76aa1e97d [diff] | |
| parent | 0d407aeaa8a31cb44b3b233f0b6807053dbaf08e [diff] |
am 0d407aea: Merge "Accept more than one SD in NsdManagerTest" * commit '0d407aeaa8a31cb44b3b233f0b6807053dbaf08e': Accept more than one SD in NsdManagerTest