| commit | 192aa872c07805daf337ae20cfa56b2d893d90f2 | [log] [tgz] |
|---|---|---|
| author | Dave Platt <dplatt@google.com> | Wed Apr 30 23:45:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 23:45:27 2014 +0000 |
| tree | db07dd08b18c0ac906ffbe2817f5b9feb201f26e | |
| parent | b941ab64e8dc8e345ee9b520536992e5b3b99393 [diff] | |
| parent | 1dd16c67e9b3bb1445823d948fc0300fc4f150f6 [diff] |
am 1dd16c67: Merge "Update sample NSD app to work reliably with current Android" * commit '1dd16c67e9b3bb1445823d948fc0300fc4f150f6': Update sample NSD app to work reliably with current Android