commit | 19f274f6994090c01cd124b210aaf847e31a8606 | [log] [tgz] |
---|---|---|
author | Justin Koh <justinkoh@google.com> | Mon May 05 22:24:46 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 05 22:24:46 2014 +0000 |
tree | 28c986c995c2ca243fe7ca82566ff0e3a0e9307a | |
parent | f4ce9e115e10d81c08732b14c7f2dfb3f1aa8799 [diff] | |
parent | 68ca14648c88d84080cafae02c9bc5cf3448096a [diff] |
am 68ca1464: (-s ours) am ed23c5bc: Hide NsdServiceInfo additions for KKWT DO NOT MERGE * commit '68ca14648c88d84080cafae02c9bc5cf3448096a': Hide NsdServiceInfo additions for KKWT DO NOT MERGE