Kevin Chyn 568d8dd3fb Merge "Always send userId to FaceService" into qt-r1-dev am: e5c0b58738 ...

am: 6c848ed8b7

Change-Id: I2ea9db58dc43c41dcbf35a93a363841043ecbe80

2019-07-03 16:30:21 -07:00

..

java

Merge "Always send userId to FaceService" into qt-r1-dev am: e5c0b58738

2019-07-03 16:30:21 -07:00

jni

Merge "Rearrange some headers"

2019-07-03 18:19:12 +00:00

proto

Merge "Force batching non-ACTIVE jobs."

2019-07-03 16:39:43 +00:00

res

Merge "Replace old no-service resource with new one" into qt-r1-dev

2019-07-02 11:19:19 -07:00

tests

Merge "Create permission manager AIDL"

2019-07-02 23:26:07 +00:00

xsd

…