Kenny Root 693ea60e9e Track change to Conscrypt ...

Change way in which an outside caller can get the preferred SSLContext.

(cherry picked from commit 8a97063720)

Bug: 19798387
Bug: 17136008
Change-Id: Ide578664bcb605304322bfddd2e640a63042fa09

2015-03-17 21:27:05 +00:00

..

java

Track change to Conscrypt

2015-03-17 21:27:05 +00:00

jni

am 494d5b77: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-dev

2015-02-19 00:05:53 +00:00

res

Import translations. DO NOT MERGE

2015-02-25 07:39:28 -08:00

tests

am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation

2015-01-30 22:24:43 +00:00