| commit | acb32f7f09054869ed475d00260a9497f2ebfa76 | [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 | 996a2dea68e891dc3940198a955289f752e407c4 | |
| parent | 3d2d2683074377b226cfe0b63c0e04fac087a9cb [diff] | |
| parent | 2e03a0883c9d34bc8ac6f42874e3cb1fd7507e57 [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