Treehugger Robot 957d1da716 Merge "Revert "Reset stack guard after fork from Zygote"" am: d64305cc30 am: aa43978533 am: 3eceb328c6 am: d7aac73340 ...

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

Change-Id: I145f5b6571266c45a876f804a0c2128acf1d8a1d

2021-05-27 21:33:49 +00:00

..

api

Merge changes from topic "may26-dab" into sc-dev am: 163db52409 am: c142a92708 am: 88d7d7b4e0

2021-05-26 21:29:47 +00:00

java

Merge "Fix getSelectionModeForCategory" am: be74a9f6ba am: 057beb9bda am: 0e61ff0344 am: bdb75c6405

2021-05-27 18:34:03 +00:00

jni

Merge "Revert "Reset stack guard after fork from Zygote"" am: d64305cc30 am: aa43978533 am: 3eceb328c6 am: d7aac73340

2021-05-27 21:33:49 +00:00

proto

…

res

Merge "Import translations. DO NOT MERGE ANYWHERE"

2021-05-27 19:49:15 +00:00

sysprop

…

tests

Merge "Fix system service power calculation when measured energy is available" into sc-dev am: 16d1188b7d am: c22cb8480d am: 9dec696e82

2021-05-26 21:06:45 +00:00

xsd

…

TEST_MAPPING

…