Baligh Uddin 5d90374016 Merge "Import translations. DO NOT MERGE"

2012-09-19 12:36:48 -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

Fix Skia assertions where we were allowing immutable bitmaps to be written to.

2012-09-19 07:21:12 -07:00

res

Merge "Import translations. DO NOT MERGE"

2012-09-19 12:36:48 -07:00

tests

Code cleanup for X509TrustManagerExtensionsTest.java

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