Brian Carlstrom 5a009dcc58 Merge "Add SSLCertificateSocketFactory.setSoWriteTimeout to allow SO_SNDTIMEO to be specified" into jb-mr1-dev

2012-09-23 12:25:31 -07:00

..

java

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

2012-09-23 12:25:31 -07:00

jni

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

2012-09-21 16:05:59 -07:00

res

Further tweak config_minScalingSpan for large screen devices

2012-09-23 11:59:57 -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