Andy Stadler 6d4e887da4 Merge "Move X509TrustManagerExtensions to correct directory" into jb-mr1-dev

2012-09-18 17:51:09 -07:00

..

java

Move X509TrustManagerExtensions to correct directory

2012-09-18 17:40:14 -07:00

jni

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

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

res

Merge "Refactor Carrier text as a movable module." into jb-mr1-dev

2012-09-18 17:00:38 -07:00

tests

Code cleanup for X509TrustManagerExtensionsTest.java

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