Anton Hansson fe0e8d4da4 Merge "Revert "Adding public API to expose DisplayInfo.deviceProductInfo"" into sc-dev am: eaeaf0acac ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib7778af2a641459fc79e93ab5d8497ad1790a09d

2021-02-24 13:14:49 +00:00

..

api

Merge "Revert "Adding public API to expose DisplayInfo.deviceProductInfo"" into sc-dev am: eaeaf0acac

2021-02-24 13:14:49 +00:00

java

Merge "Revert "Adding public API to expose DisplayInfo.deviceProductInfo"" into sc-dev am: eaeaf0acac

2021-02-24 13:14:49 +00:00

jni

Merge "Revert "Adding public API to expose DisplayInfo.deviceProductInfo"" into sc-dev

2021-02-24 12:27:18 +00:00

proto

Add compat info to WindowManager proto dump

2021-02-23 08:09:05 +00:00

res

Merge "Revert "Add API to let apps color CallStyle notifications themse..."" into sc-dev am: 1d57fc25ae

2021-02-24 08:55:12 +00:00

sysprop

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

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

tests

Merge "Send broadcast to notify the events of a CUJ session" into sc-dev am: f6ed5fc57c

2021-02-24 03:03:59 +00:00

xsd

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

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

TEST_MAPPING

…