summaryrefslogtreecommitdiffstats
path: root/core/java/android/hardware/SerialManager.java
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2012-09-23 12:25:31 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-23 12:25:31 -0700
commit5a009dcc58a46c41f1b54ccffca7d1317bbbff18 (patch)
tree181948b38b2e58662ce3494301a4aef1c3bbfeeb /core/java/android/hardware/SerialManager.java
parentbda527eca601b27ae66b6a93819cbe934e5ec782 (diff)
parent7ab7a8b582b29d34ec0fdbd0c727e225f350bb30 (diff)
downloadframeworks_base-5a009dcc58a46c41f1b54ccffca7d1317bbbff18.zip
frameworks_base-5a009dcc58a46c41f1b54ccffca7d1317bbbff18.tar.gz
frameworks_base-5a009dcc58a46c41f1b54ccffca7d1317bbbff18.tar.bz2
Merge "Add SSLCertificateSocketFactory.setSoWriteTimeout to allow SO_SNDTIMEO to be specified" into jb-mr1-dev
Diffstat (limited to 'core/java/android/hardware/SerialManager.java')
0 files changed, 0 insertions, 0 deletions