| commit | 9fdebc206948432eaa96b3281e389a19c2a5939f | [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 | f10a135ce183818e05c8050a16bfd4f6b3e92af9 | |
| parent | 8aa9792fa6b1d09e63c99bdd8f83e16a419aefb7 [diff] | |
| parent | d1cd31c57e1ef32f9258defea6743dd5591c1d19 [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