2a758487f7f063b97eecc3b0edbc3c3d08b437b2
164f605cf0 -s ours am: 94c345049b -s ours am: 1769811fee -s ours am: c1d7346b13 -s ours am: 2f719a2d15 -s ours
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 d4b5212eb6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816753
Change-Id: Iff8572c5480959f6e04b44daeb3f5e47e7b64a74
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%