Steven Moreland 93b988e6ba Merge "HIDL stuff to TestApi." am: bc79587a85 ...

am: e6883edf8a

Change-Id: I31b92b9c23f54d889bee4bc2d2d370b5ad3af303

2019-01-15 13:41:59 -08:00

..

java

Merge "HIDL stuff to TestApi." am: bc79587a85

2019-01-15 13:41:59 -08:00

jni

Merge "Add APEX conscrypt.jar to Zygote whitelist"

2019-01-15 15:58:49 +00:00

proto

Adding tests and move launcher.proto

2018-12-15 13:52:06 -08:00

res

Merge "Remove unnecessary right padding from time picker" am: 71a1e5cfe1

2019-01-09 05:41:49 -08:00

tests

RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters.

2019-01-07 17:10:30 -08:00