Kenny Root 0634c4f77f Track updates to Conscrypt ...

am: 7fdce769c3

Change-Id: I691f1ed588814311363f67b8ce43cbe247e54b71

2017-05-05 21:08:48 +00:00

..

java

Track updates to Conscrypt

2017-05-05 21:08:48 +00:00

jni

Merge "Add android.os.VintfRuntimeInfo"

2017-04-29 03:00:08 +00:00

res

Add (disabled) time zone update system server impl

2017-05-04 19:46:47 +01:00

tests

Merge "Time zone update API classes"

2017-05-04 13:51:39 +00:00