OSDN Git Service

Merge branch 'master' of git://android.git.kernel.org/platform/system/core into merge...
authorJean-Baptiste Queru <jbq@google.com>
Thu, 9 Jul 2009 18:33:37 +0000 (11:33 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 9 Jul 2009 18:34:12 +0000 (11:34 -0700)
* 'master' of git://android.git.kernel.org/platform/system/core:
  adb: Use correct language ID when retrieving USB serial number.
  Fix typo in adb commandline help
  Fix bug where ECONNABORTED would have always occured on asocket_write.
  Helper to perform abortable blocking operations on a socket:


Trivial merge