Alec Mouri 080ba77331 Merge "JNI wrapper for FpsListener." into sc-dev am: 1a621e8eff ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec6ec2b3f41a51a9397acd37f0e216c0e01ad9ee

2021-02-25 14:30:32 +00:00

..

api

Merge "Add session ID"

2021-02-24 21:29:16 +00:00

java

Merge "JNI wrapper for FpsListener." into sc-dev am: 1a621e8eff

2021-02-25 14:30:32 +00:00

jni

Merge "JNI wrapper for FpsListener." into sc-dev

2021-02-24 22:41:10 +00:00

proto

Add compat info to WindowManager proto dump

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

res

Merge "Add API to let apps color CallStyle notifications themselves." into sc-dev am: 5ba00654f4

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

sysprop

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

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

tests

Merge "JNI wrapper for FpsListener." into sc-dev am: 1a621e8eff

2021-02-25 14:30:32 +00:00

xsd

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

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

TEST_MAPPING

…