diff options
author | Dave Platt <dplatt@google.com> | 2014-03-13 23:42:03 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-13 23:42:03 +0000 |
commit | e4e6b3cc1908c60bd0e45063116cf935b7aad56a (patch) | |
tree | e405ae1eae8989573bcf30a8cde9ea50bacb0aff /core/java/android/os/Parcelable.java | |
parent | 00d115a7533df23027f671c90c0ae52684392e4a (diff) | |
parent | 21384faa2b3da619a54b35f15936c00593b30694 (diff) | |
download | frameworks_base-e4e6b3cc1908c60bd0e45063116cf935b7aad56a.zip frameworks_base-e4e6b3cc1908c60bd0e45063116cf935b7aad56a.tar.gz frameworks_base-e4e6b3cc1908c60bd0e45063116cf935b7aad56a.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/java/android/os/Parcelable.java')
0 files changed, 0 insertions, 0 deletions