Fabrice Di Meglio 9ffc6047f1 Merge "Fix bug #7173155 API REVIEW: android.view.View" into jb-mr1-dev

2012-09-18 15:42:34 -07:00

..

java

Merge "Fix bug #7173155 API REVIEW: android.view.View" into jb-mr1-dev

2012-09-18 15:42:34 -07:00

jni

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

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

res

Merge "Remove trailing period from missing SIM string" into jb-mr1-dev

2012-09-18 15:33:49 -07:00

tests

Code cleanup for X509TrustManagerExtensionsTest.java

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