| commit | 75dfa14c8277f6e7d592061e2bb7e2b283015a63 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Jun 02 23:46:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 02 23:46:52 2015 +0000 |
| tree | 5e2f8a529be3bd03c79794b86ecca0dcfb4f58ab | |
| parent | 52951f989c63b6e8d84f7c9bcefa69db3e4d3b14 [diff] | |
| parent | ef6c0b98d5713f58f6a2014d1e82ed4bc4057519 [diff] |
am ef6c0b98: am be5ae9fb: am 1d06566c: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev automerge: 97fa3a2 * commit 'ef6c0b98d5713f58f6a2014d1e82ed4bc4057519': Accept more than one SD in NsdManagerTest