Andy Stadler 6f3fd45b3c am fe013183: am 6d4e887d: Merge "Move X509TrustManagerExtensions to correct directory" into jb-mr1-dev ...

* commit 'fe0131839214ce6251def672bba0855e395ed54f':
  Move X509TrustManagerExtensions to correct directory

2012-09-18 17:58:05 -07:00

..

java

am fe013183: am 6d4e887d: Merge "Move X509TrustManagerExtensions to correct directory" into jb-mr1-dev

2012-09-18 17:58:05 -07:00

jni

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

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

res

am 29a1b604: am 402f0c81: Merge "Refactor Carrier text as a movable module." into jb-mr1-dev

2012-09-18 17:16:56 -07:00

tests

Code cleanup for X509TrustManagerExtensionsTest.java

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