11f6e05c0b4e5c00d2bf0dfb6b5bc7b274ec1820
c2d264989a am: f1c5754b97 -s ours am: 7d9c55fd15 -s ours am: a85f1fe58d -s ours am: bf77efaa37 -s ours am: d0e942d756 -s ours
am skip reason: Merged-In I0925583ab54d6c81c415859618f6b907ab7baada with SHA-1 6d417539d7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696126
Change-Id: Iad5f48731cd2c8f7bc790617bcb259dce7e384db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merge "Fix ZipFilePerfTest issues by closing the file in each loop iteration." am:
90c3935195 am: 9c051367f8 am: 4c2143df58 am: 10eceff1b1 am: b90b509fc7
Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-qpr1-dev am:
950fb419e7
Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-qpr-dev am:
a15093de05 am: 5415ede546
…
…
Merge "Add instructions on how to annotate an AIDL interface" am:
b6df9fb2e8 am: b691d9ce36 am: 9e7a44c173 am: 3ced8e8092
…
Merge "Migrate rs/jni to Soong" am:
eaebd2cd54 am: a6f5cf56e8 am: 21587435c7 am: 22b41229f1 am: 87bbc3ef20
…
…
[conflict] Merge "Do not send AccessibilityEvent if notification is for different user." into qt-dev am:
dedf573b23
…
Merge "Remove unused empty filegroups from frameworks/base." am:
5ee9c55130 am: 76e9b955c5 am: 735d0192f6
…
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%