diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-07-09 11:33:37 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-07-09 11:34:12 -0700 |
| commit | 5b63399039c9c859c45926f89bc8ae216d914251 (patch) | |
| tree | 8ce29339910fe12a7567b709fda59118ed5a8042 /nexus/Controller.cpp | |
| parent | 52dddc6149cde8e4bb2b3cbca53f77fcc4e62e95 (diff) | |
| parent | dc9d52f35d6d590863b358997bf25605cf72be5f (diff) | |
| download | system_core-5b63399039c9c859c45926f89bc8ae216d914251.zip system_core-5b63399039c9c859c45926f89bc8ae216d914251.tar.gz system_core-5b63399039c9c859c45926f89bc8ae216d914251.tar.bz2 | |
Merge branch 'master' of git://android.git.kernel.org/platform/system/core into merge_korg_master
* '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:
Diffstat (limited to 'nexus/Controller.cpp')
0 files changed, 0 insertions, 0 deletions