Antoan Angelov c80bb1f31e Merge "Only add user id to content uri if launching cross-profile target" into rvc-dev am: 6d5e349bcd am: 0cc6086757 ...

Original change: undetermined

Change-Id: If2ae5a93f45abc390c68bd9244bbf54802f9a820

2020-06-02 11:01:50 +00:00

..

java

Merge "Only add user id to content uri if launching cross-profile target" into rvc-dev am: 6d5e349bcd am: 0cc6086757

2020-06-02 11:01:50 +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 am: a7dfbb4186

2020-05-26 22:08:17 +00:00

res

Import translations. DO NOT MERGE

2020-06-01 20:22:41 +00:00

tests

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

2020-06-01 10:15:14 +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

…