OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c17d986 3b74645)
am 6b2c56a2: Merge "DO NOT MERGE Do not kill sockets going default->hipri" into ginge...
authorRobert Greenwalt <robdroid@android.com>
Wed, 18 Aug 2010 22:14:31 +0000 (15:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 18 Aug 2010 22:14:31 +0000 (15:14 -0700)
Merge commit '6b2c56a299eb05deef2b887549e29e9e9f0f2cf6' into gingerbread-plus-aosp

* commit '6b2c56a299eb05deef2b887549e29e9e9f0f2cf6':
  DO NOT MERGE Do not kill sockets going default->hipri


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help