summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorDave Platt <dplatt@google.com>2014-03-14 13:13:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-14 13:13:38 +0000
commit6b2b14028ddec40b70c346f5a1e4d266720fadcd (patch)
tree0570a76e9911ca3501190e8349595a9d83de1f8e /core/java
parent2df4b6a050452c48a31a9543e63388d4fc2433ba (diff)
parentcb1254f1abc44b82e2a9da0d9a73230eb46e129e (diff)
downloadframeworks_base-6b2b14028ddec40b70c346f5a1e4d266720fadcd.zip
frameworks_base-6b2b14028ddec40b70c346f5a1e4d266720fadcd.tar.gz
frameworks_base-6b2b14028ddec40b70c346f5a1e4d266720fadcd.tar.bz2
am cb1254f1: am e4e6b3cc: am 21384faa: am f3a2895a: Merge "NsdService does not clean up after exiting clients"
* commit 'cb1254f1abc44b82e2a9da0d9a73230eb46e129e': NsdService does not clean up after exiting clients
Diffstat (limited to 'core/java')
0 files changed, 0 insertions, 0 deletions