summaryrefslogtreecommitdiffstats
path: root/core/res/AndroidManifest.xml
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-06-02 07:37:52 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-02 07:37:52 -0700
commit8e97372913c9236ffdee175c6da99dc00c22b3e1 (patch)
tree154d2d7d1778896b1bd2db091e57aace9d50fc11 /core/res/AndroidManifest.xml
parented1c8d7dc09996351db711be7d2acf0ff4715c2d (diff)
parent8050a02b0130f0ba2e2ddfc240aa59029ee2ac6d (diff)
downloadframeworks_base-8e97372913c9236ffdee175c6da99dc00c22b3e1.zip
frameworks_base-8e97372913c9236ffdee175c6da99dc00c22b3e1.tar.gz
frameworks_base-8e97372913c9236ffdee175c6da99dc00c22b3e1.tar.bz2
am 8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
* commit '8050a02b0130f0ba2e2ddfc240aa59029ee2ac6d': DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
Diffstat (limited to 'core/res/AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions