Charles Chen 427a66fa71 Merge "Send DA's config directly when attaching to DA" into sc-v2-dev

2021-07-10 05:02:32 +00:00

..

api

Merge "Optimize AttributionSource tokens - base" into sc-dev am: 2b90cc827b

2021-07-10 02:27:03 +00:00

java

Merge "Send DA's config directly when attaching to DA" into sc-v2-dev

2021-07-10 05:02:32 +00:00

jni

Merge "Camera: Set metadata vendor id in extension proxy service" into sc-dev am: 2d5d1676ff

2021-07-08 20:30:32 +00:00

proto

Merge "Add statsd logs for Sensor Privacy." into sc-dev am: cd40c7406f

2021-07-08 17:28:53 +00:00

res

Import translations. DO NOT MERGE ANYWHERE

2021-07-09 07:13:58 +00:00

sysprop

…

tests

Merge "Send DA's config directly when attaching to DA" into sc-v2-dev

2021-07-10 05:02:32 +00:00

xsd

…

TEST_MAPPING

…