| commit | 5c868691cd6b2c3ff899e0a58e40f722c9e2913b | [log] [tgz] |
|---|---|---|
| author | Dave Platt <dplatt@google.com> | Tue May 13 15:20:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 15:20:44 2014 +0000 |
| tree | d593cb34b8e2adbe2c14ae99554c7d5824f3cbed | |
| parent | e73203b82a877b4965213c2c94b4cba6ffdcaf3d [diff] | |
| parent | 192aa872c07805daf337ae20cfa56b2d893d90f2 [diff] |
am 192aa872: am 1dd16c67: Merge "Update sample NSD app to work reliably with current Android" * commit '192aa872c07805daf337ae20cfa56b2d893d90f2':