Automerger Merge Worker 5d8c7cd302 Merge "Merge "Moving the NO_SESSION_ID constant from ContentCaptureSession to ContentCaptureManager" into rvc-dev am: d347c7acaf am: 25bdce7fcf am: aa4391ae70" into rvc-qpr-dev-plus-aosp am: 415d437fc2 ...

Change-Id: Ide81ce96c1eb37860ed44ff724bb48ec215fbc1c

2020-03-27 19:31:00 +00:00

..

java

Merge "Merge "Moving the NO_SESSION_ID constant from ContentCaptureSession to ContentCaptureManager" into rvc-dev am: d347c7acaf am: 25bdce7fcf am: aa4391ae70" into rvc-qpr-dev-plus-aosp am: 415d437fc2

2020-03-27 19:31:00 +00:00

jni

Merge "Merge changes If7ea17d5,If6364fd6 into rvc-dev am: 8275fb7d66 am: a6f2c4f62e" into rvc-d1-dev-plus-aosp am: c442bae47a am: 8b07124986

2020-03-27 18:45:58 +00:00

proto

Merge "Add Secure Setting for Controls" into rvc-dev am: 1f8d91de8c am: efe1971995 am: 48e3746dcd am: 472c0b8e35

2020-03-27 18:23:24 +00:00

res

Merge "Add a config resource for controls package" into rvc-dev am: bce4b444e3 am: ff99d96cdc am: 902d92c1c6 am: 734da30c26

2020-03-27 17:55:17 +00:00

tests

Merge "Make caption a insets source" into rvc-dev am: ac30aafd29 am: 0263c7b06a

2020-03-27 17:59:35 +00:00

xsd

…

TEST_MAPPING

…