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

* commit '9ffc6047f14883f853b643a2913bd590995b9031':
  Fix bug #7173155 API REVIEW: android.view.View

2012-09-18 15:54:55 -07:00

..

java

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

2012-09-18 15:54:55 -07:00

jni

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

2012-09-18 14:59:38 -07:00

res

am 6eac514a: Merge "Remove trailing period from missing SIM string" into jb-mr1-dev

2012-09-18 15:54:38 -07:00

tests

Code cleanup for X509TrustManagerExtensionsTest.java

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