Kenny Root 11b29e4e1b am c1d863e7: am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt" ...

* commit 'c1d863e7a4b55f8e583067eebaffc6686723d7ab':
  Use X509ExtendedTrustManager and not Conscrypt

2014-03-25 17:26:38 +00:00

..

java

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

2014-03-25 17:26:38 +00:00

jni

am ea96d791: am 5f0d44f6: Merge "Fix scaleNinePatch."

2014-03-25 14:31:45 +00:00

res

am c620ec36: am 3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev

2014-03-21 17:57:01 +00:00

tests

am 1b007565: am 9b650702: Merge "Fix state transition verification." into klp-dev

2014-03-18 23:06:32 +00:00