Kholoud Mohamed bc986f2f76 Merge "Added some testAPIs in ContentSuggestionsManager" into sc-dev am: 6c80c464e0 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id335dd4c03d6d68ff99d7973139ff0d1391a7953

2021-03-01 13:46:22 +00:00

..

api

Merge "Added some testAPIs in ContentSuggestionsManager" into sc-dev am: 6c80c464e0

2021-03-01 13:46:22 +00:00

java

Merge "Added some testAPIs in ContentSuggestionsManager" into sc-dev am: 6c80c464e0

2021-03-01 13:46:22 +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 "Add battery history to BatteryStatsUsage" into sc-dev am: 1a0e70c7bd

2021-03-01 04:53:28 +00:00

xsd

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

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

TEST_MAPPING

…