Marin Shalamanov ea94ea3e9a Merge "Update javadoc for setFrameRate" into sc-dev am: deb3ccf048 ...

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

Change-Id: If98c8873ebcfe95ebc5418569ef10e6b84ffc3c8

2021-04-27 16:12:10 +00:00

..

api

Merge "Add Executor to Permission Group methods in PermissionControllerManager" into sc-dev am: 2af054a29f

2021-04-27 15:19:28 +00:00

java

Merge "Update javadoc for setFrameRate" into sc-dev am: deb3ccf048

2021-04-27 16:12:10 +00:00

jni

Merge "Add constant values for MPEG-H."

2021-04-23 22:51:55 +00:00

proto

Merge "Add OWNERS for android/providers" am: 30a6e0a4ae am: a8067dd770 am: 665d7c76bb

2021-04-26 17:03:23 +00:00

res

Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev

2021-04-27 14:56:57 +00:00

sysprop

…

tests

Merge "Revert "Do not relaunch bg activities when application info changes"" into sc-dev am: 9caa70a8d3

2021-04-27 02:25:35 +00:00

xsd

…

TEST_MAPPING

…