Brad Ebinger 2114adb0b8 Merge "Remove the deprecated SipDelegate methods pertaining to Dialogs" am: e2540fd31f am: bebe46bfb0 am: 1cba9be5c8 am: 0a2f949f56 ...

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

Change-Id: I0832b3b9909a5ad115c07b54b738e45ae5299a99

2021-05-25 22:14:58 +00:00

..

api

Merge "Remove the deprecated SipDelegate methods pertaining to Dialogs" am: e2540fd31f am: bebe46bfb0 am: 1cba9be5c8 am: 0a2f949f56

2021-05-25 22:14:58 +00:00

java

Merge "Freezer kill reason in App Process Kill Stats" into sc-dev am: a80340f9c6 am: 74bafb831e am: b0a14c1af1

2021-05-25 20:36:54 +00:00

jni

Merge "Reset stack guard after fork from Zygote" am: 2df0b0fd74 am: e8d0aeac1e am: 83e09badb4 am: e434abf6ee

2021-05-25 19:05:05 +00:00

proto

Merge "Updates OWNERS files" into sc-dev

2021-05-24 18:30:19 +00:00

res

Merge "Resolve Notification.Colors once, instead of lazily." into sc-dev am: f294d0ba5f am: 8d6af97d2b am: 9dc3fc72de

2021-05-25 17:33:27 +00:00

sysprop

…

tests

Merge "Flush the animation if it is canceled" into sc-dev am: ea428b55e7 am: 91b4b7bd05 am: a15a08955e

2021-05-25 18:03:22 +00:00

xsd

Update location bypass allowlist

2021-05-21 09:25:47 -07:00

TEST_MAPPING

…