OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5b702d9 6cfba16)
am 6cfba16c: am 40ad466e: am 4c686dad: am cceed1df: Merge "Include <sys/socket.h...
authorElliott Hughes <enh@google.com>
Wed, 12 Sep 2012 18:11:41 +0000 (11:11 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Sep 2012 18:11:41 +0000 (11:11 -0700)
* commit '6cfba16c25d04ae13c5b06d53bb495571bd83e95':
  Include <sys/socket.h> instead of <linux/socket.h>.


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