Kenny Root 6ab41d71eb am 266de3ef: am dd3e6399: am c1d863e7: am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt" ...

* commit '266de3efcd4b57ba3b301d87ff0fb692090d9a95':
  Use X509ExtendedTrustManager and not Conscrypt

2014-03-25 21:23:18 +00:00

..

java

am 266de3ef: am dd3e6399: am c1d863e7: am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt"

2014-03-25 21:23:18 +00:00

jni

Shared library resource support

2014-03-25 12:09:56 -07:00

res

Merge "Import translations. DO NOT MERGE"

2014-03-25 18:56:32 +00:00

tests

Add one test application for multidex.

2014-03-24 11:28:31 +01:00