tree d593cb34b8e2adbe2c14ae99554c7d5824f3cbed
parent e73203b82a877b4965213c2c94b4cba6ffdcaf3d
parent 192aa872c07805daf337ae20cfa56b2d893d90f2
author Dave Platt <dplatt@google.com> 1399994444 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399994444 +0000

am 192aa872: am 1dd16c67: Merge "Update sample NSD app to work reliably with current Android"

* commit '192aa872c07805daf337ae20cfa56b2d893d90f2':