summaryrefslogtreecommitdiffstats
path: root/core/java/android/net/LocalSocket.java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2014-10-03 21:02:55 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-03 21:02:55 +0000
commitd341344be0eb5e47b3d159ae354aa21294fd6bca (patch)
tree08bd14efc1ea6efb5c4fb93f1152077da2f45d2f /core/java/android/net/LocalSocket.java
parent1178efb62cf746a6d4d529790648b3534cfdeecf (diff)
parent7caa51e6ec6443d5c1fdb96f7e42508b074b4278 (diff)
downloadframeworks_base-d341344be0eb5e47b3d159ae354aa21294fd6bca.zip
frameworks_base-d341344be0eb5e47b3d159ae354aa21294fd6bca.tar.gz
frameworks_base-d341344be0eb5e47b3d159ae354aa21294fd6bca.tar.bz2
am 7caa51e6: Merge "Fix issue #17811029: Settings provider race when removing users" into lmp-dev
* commit '7caa51e6ec6443d5c1fdb96f7e42508b074b4278': Fix issue #17811029: Settings provider race when removing users
Diffstat (limited to 'core/java/android/net/LocalSocket.java')
0 files changed, 0 insertions, 0 deletions