7dcf414cf174cec2df44bb1572c2a7d112a35eda
207177c552 -s ours am: 37d76931a4 -s ours
am skip reason: Merged-In I85e6a1700f72db1d55a7929e5d4d93f8cac66c64 with SHA-1 948cd02535 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19739731
Change-Id: I868940d0f0fb35c8feb6b5dbb0d0ddf33c54283d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
…
…
…
Merge "Add TaskFragmentOrganizer#applyTransaction with request transition" into tm-qpr-dev am:
2c9b75902e am: 85167f8475
…
…
[conflict] Merge "Fix array-related errorprone warnings" am:
a1eb8cf128 am: 44f8576073 am: 91d6c5b564 am: 6a79ae2567 am: 9b3a5fc03b
…
…
Merge "Ignore scheduleFinishResizePip if there is no surface to operate on." into tm-qpr-dev am:
91a8c017b2 am: 97469d046d
…
…
…
…
…
…
…
…
…
…
Merge "Add KEY_CAPABILITIES_EXEMPT_FROM_SINGLE_DC_CHECK_INT_ARRAY" am:
c845883448 am: 4a4b536059 am: fbc2bcad4a
Merge "Register VibrationSettings as a listener to: 1) virtual displays creation and removal. 2) App Uids running on virtual displays. These will be used in combination to ignore vibration initiated from a virtual display." into tm-qpr-dev am:
442f33f79e
…
…
[conflict] Merge "Fix array-related errorprone warnings" am:
a1eb8cf128 am: 44f8576073 am: 91d6c5b564 am: 6a79ae2567 am: 9b3a5fc03b
…
…
…
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%