Adam Vartanian dc310b7ccd Merge "Use public APIs instead of Conscrypt ones" ...

am: 1b9adbfdd1

Change-Id: I8747b75ef6eccaabffa0455f2a6e53a9865dbd7d

2019-02-27 04:34:46 -08:00

..

java

Merge "Use public APIs instead of Conscrypt ones"

2019-02-27 04:34:46 -08:00

jni

Merge "Log the pid of the forked zygote child."

2019-02-26 23:22:52 +00:00

proto

Add build rule of data stall proto

2019-02-14 10:55:03 +08:00

res

Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master

2019-02-23 00:39:16 +00:00

tests

Merge "Convert FrameworksCoreTests to Android.bp"

2019-02-26 00:11:11 -08:00