| commit | 381ac080547ef8294edd871c5bb0b29d15f7158b | [log] [tgz] |
|---|---|---|
| author | Christopher Lane <lanechr@google.com> | Mon Apr 14 21:16:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 14 21:16:27 2014 +0000 |
| tree | 73ac97c2c2ecd14c8cb613708240fef55437e51e | |
| parent | f6ee7e3f47ee443078d803b03c0507ea1bf5cd54 [diff] | |
| parent | 62538940de1755c71c56b0e5d81e12397e5de58a [diff] |
am 62538940: Merge "Add support for custom TXT records in NSD" into klp-modular-dev * commit '62538940de1755c71c56b0e5d81e12397e5de58a': Add support for custom TXT records in NSD