Irfan Sheriff 5d4206a55c Merge "Get strings in" into jb-mr1-dev

2012-09-18 22:34:34 -07:00

..

java

Merge "Get strings in" into jb-mr1-dev

2012-09-18 22:34:34 -07:00

jni

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

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

res

Merge "Get strings in" into jb-mr1-dev

2012-09-18 22:34:34 -07:00

tests

Code cleanup for X509TrustManagerExtensionsTest.java

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