Adam Powell 2a81fe68c2 Merge "Further tune config_minScalingSpan for small screen devices." into jb-mr1-dev

2012-09-18 18:49:32 -07:00

..

java

Merge "Make invalidateOptionsMenu asynchronous" into jb-mr1-dev

2012-09-18 18:42:59 -07:00

jni

Merge "SurfaceTexture: remove call to doGLFenceWait" into jb-mr1-dev

2012-09-18 14:32:01 -07:00

res

Merge "Further tune config_minScalingSpan for small screen devices." into jb-mr1-dev

2012-09-18 18:49:32 -07:00

tests

Code cleanup for X509TrustManagerExtensionsTest.java

2012-09-18 14:44:54 -07:00