summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorDave Platt <dplatt@google.com>2014-03-13 23:41:28 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-13 23:41:28 +0000
commitdec3c628de9c8d9e9e9cc6c9a3da196462c190fa (patch)
tree4de24f26449fd7866ec47308b62c7daec62edf83 /core
parent22abe3829b818ae9e64e4e6278ba50406b598ea6 (diff)
parent21384faa2b3da619a54b35f15936c00593b30694 (diff)
downloadframeworks_base-dec3c628de9c8d9e9e9cc6c9a3da196462c190fa.zip
frameworks_base-dec3c628de9c8d9e9e9cc6c9a3da196462c190fa.tar.gz
frameworks_base-dec3c628de9c8d9e9e9cc6c9a3da196462c190fa.tar.bz2
am 21384faa: am f3a2895a: Merge "NsdService does not clean up after exiting clients"
* commit '21384faa2b3da619a54b35f15936c00593b30694': NsdService does not clean up after exiting clients
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions