Ruslan Tkhakokhov ac5580350c Merge "Update D2D logic in line with new opt-out rules" into sc-dev am: b56fc740bb ...

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13699589

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If2236b3d5aec63ff3f1e4540f33c8e11b246009d

2021-03-01 18:00:48 +00:00

..

api

resolve merge conflicts of 7df4e1c5a4

2021-03-01 15:55:14 +00:00

java

Merge "Update D2D logic in line with new opt-out rules" into sc-dev am: b56fc740bb

2021-03-01 18:00:48 +00:00

jni

Merge changes from topic "cp-rvc-aosp" into sc-dev

2021-02-26 22:56:18 +00:00

proto

Merge "Add support for tracking PANS data usage" am: 90261da202 am: eebeb725a8 am: e30a010ca3

2021-03-01 07:59:54 +00:00

res

Merge "Import translations. DO NOT MERGE ANYWHERE"

2021-03-01 02:23:23 +00:00

sysprop

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

2021-02-21 20:12:24 +00:00

tests

Merge "Update D2D logic in line with new opt-out rules" into sc-dev am: b56fc740bb

2021-03-01 18:00:48 +00:00

xsd

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

2021-02-21 20:12:24 +00:00

TEST_MAPPING

…