Kevin Chyn 9710f8eaab Merge "Send callingUserId from AuthService -> BiometricServiceBase" into rvc-dev am: 20534dcc8d ...

Change-Id: Ib44ff58a107d0e1e4c58b98f0d15234f1b2ea01c

2020-06-01 16:04:30 +00:00

..

java

Merge "Send callingUserId from AuthService -> BiometricServiceBase" into rvc-dev am: 20534dcc8d

2020-06-01 16:04:30 +00:00

jni

Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" am: fdcd562529

2020-06-01 02:14:25 +00:00

proto

Merge "Add Setting for NR screen off indications" into rvc-dev am: 8300a64490

2020-05-26 22:02:50 +00:00

res

Import translations. DO NOT MERGE

2020-05-30 18:47:56 +00:00

tests

Merge changes from topic "b152482542-endrun" am: c3508715f3 am: e861c8654e

2020-06-01 09:59:32 +00:00

xsd

Merge "Convert core/xsd/vts/Android.mk file to Android.bp" am: 682de55962 am: 6fc5f5e76e

2020-05-19 22:04:40 +00:00

TEST_MAPPING

…