| commit | ece410939fbb7a463c79ea63adf3b96c12dc386e | [log] [tgz] |
|---|---|---|
| author | Jesse Gunsch <gunsch@google.com> | Thu Apr 10 01:07:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 10 01:07:23 2014 +0000 |
| tree | 9148f0145333fef705a2bee8070f48a93a7fdcb8 | |
| parent | 9817ddd420aaa885f92f778ae2cfd17e6a71bc87 [diff] | |
| parent | 3c1c137579783fad81169da01d5c7c5819c81b07 [diff] |
am 3c1c1375: am 8d31358f: Merge "Merge "NsdService does not clean up after exiting clients"" into klp-modular-dev * commit '3c1c137579783fad81169da01d5c7c5819c81b07': Merge "NsdService does not clean up after exiting clients"