Brian Carlstrom ea28e107c3 am 5a009dcc: Merge "Add SSLCertificateSocketFactory.setSoWriteTimeout to allow SO_SNDTIMEO to be specified" into jb-mr1-dev ...

* commit '5a009dcc58a46c41f1b54ccffca7d1317bbbff18':
  Add SSLCertificateSocketFactory.setSoWriteTimeout to allow SO_SNDTIMEO to be specified

2012-09-24 08:47:05 -07:00

..

java

am 5a009dcc: Merge "Add SSLCertificateSocketFactory.setSoWriteTimeout to allow SO_SNDTIMEO to be specified" into jb-mr1-dev

2012-09-24 08:47:05 -07:00

jni

am 5ce25d71: Merge "NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound" into jb-mr1-dev

2012-09-21 17:49:51 -07:00

res

am bda527ec: Merge "Further tweak config_minScalingSpan for large screen devices" into jb-mr1-dev

2012-09-24 08:47:02 -07:00

tests

Merge "fix broken user build: do not throw an error when in user flavor." into jb-mr1-dev

2012-09-20 15:35:00 -07:00