diff options
author | Dave Platt <dplatt@google.com> | 2014-03-13 23:47:32 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-13 23:47:32 +0000 |
commit | cb1254f1abc44b82e2a9da0d9a73230eb46e129e (patch) | |
tree | 93ee764f1d838de7d1dddf5c665c54fe8df7c8c3 /core/java/android | |
parent | 2facefe648996732c61a8a26c76704faa6d20e56 (diff) | |
parent | e4e6b3cc1908c60bd0e45063116cf935b7aad56a (diff) | |
download | frameworks_base-cb1254f1abc44b82e2a9da0d9a73230eb46e129e.zip frameworks_base-cb1254f1abc44b82e2a9da0d9a73230eb46e129e.tar.gz frameworks_base-cb1254f1abc44b82e2a9da0d9a73230eb46e129e.tar.bz2 |
am e4e6b3cc: am 21384faa: am f3a2895a: Merge "NsdService does not clean up after exiting clients"
* commit 'e4e6b3cc1908c60bd0e45063116cf935b7aad56a':
NsdService does not clean up after exiting clients
Diffstat (limited to 'core/java/android')
0 files changed, 0 insertions, 0 deletions