05393fd59570b7ffe7e4b6a75cfdfc2af7cafaa9
f5c77e214e -s ours am: 9a5d3b3bd3 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19840734 Change-Id: I229d3594ac84e8f487d0f7d016981736c58e8339 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
…
…
Merge "Fix module-file name collisions" am:
92f4e14b94 am: b88cb3e1ce am: 1d4139e72d am: 645e261b33 am: 0bb48ec274
…
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 "Stop making copies when updating input channels" into tm-qpr-dev am:
4e86b76aaa am: 436bd56b5b
…
Merge "Visualizer: use actual sampling rate of the instance" am:
ff525f4748 am: 61940da881 am: 8c6ec7de71 am: 78f025d2fe
…
…
…
…
…
…
…
…
…
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%