| commit | a128d843f4330b2c669dfd1305770733bf1b3b18 | [log] [tgz] |
|---|---|---|
| author | Vinit Deshpande <vinitd@google.com> | Fri Oct 24 18:05:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 24 18:05:52 2014 +0000 |
| tree | 287771ff9d22960f1e85ed8c9136e71ed450ac93 | |
| parent | 9532aa5f868cddccf125efd903262699c787b148 [diff] | |
| parent | 0b3e6eb196c105833b8fbdabaa4f73fcab8b5f8c [diff] |
am 2e03a088: am 5047f2aa: am 161f55f2: Merge "Relax NsdManagerTest\'s duplicate event check" into lmp-dev * commit '2e03a0883c9d34bc8ac6f42874e3cb1fd7507e57': Relax NsdManagerTest's duplicate event check