Kenny Root 77ceb5e8f1 Merge "Use X509ExtendedTrustManager and not Conscrypt"

2014-03-25 17:06:55 +00:00

..

java

Use X509ExtendedTrustManager and not Conscrypt

2014-03-24 17:05:22 -07:00

jni

Fix scaleNinePatch.

2014-03-24 12:35:01 +00:00

res

Merge "Telephony API extension v2"

2014-02-13 04:26:33 +00:00

tests

Null pointer exception in FileRotator.java

2014-03-13 17:25:01 +01:00