d99841fc66ffc1e445764c26c073831ab30eb8ec
36f0a83ead -s ours am: 4d8b1e26c1 -s ours am: d51938deb3 -s ours
am skip reason: Merged-In Ia83da6286875f1a539edbaf515fe01c07ce1ba76 with SHA-1 1df71d4e7b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18436742
Change-Id: I3cecf8f9c7c75307822851f78af33ff7ef20a3de
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 "Track basic TARE statistics." into tm-dev am:
5fe461a1ec am: 22e963a352 am: 198dda9659 am: b3d7b8be1f
Merge "[Bugfix][BootAnimation] Fix the issue of the transparent background image shows transparent background unexpectedly in BootAnimation on some MTK platforms." am:
6562eb87f3 am: e3f08c403e am: 8ab593e3a8 am: 11aec9327a am: 09a38f4d9f
Merge "Revert "Revert "Merge "Restore V2+ signature requirement for system apps" into tm-dev am:
a347b6c2e6 am: 8aa6d20125""" into tm-d1-dev am: c2da54f24e am: 20adc38129 am: d658e13ec5
Merge changes I1978ce3a,I79160004 into tm-dev am:
35640f948e am: d0cd381a0b am: ce8f9488f2 am: 825eee18fc
…
…
…
Merge "Merge "Fix clipping of an app badge on bubbles in overflow" into tm-qpr-dev am: a6e03b009c" into tm-qpr-dev-plus-aosp am:
c27b541c09
…
…
…
…
…
…
Merge "Launch app intent after unlock" into tm-dev am:
ff1ae8716f am: 1c458d3522 am: d8f6763ccb am: a18b2410fd
…
…
…
Merge "Revert "Revert "Merge "Restore V2+ signature requirement for system apps" into tm-dev am:
a347b6c2e6 am: 8aa6d20125""" into tm-d1-dev am: c2da54f24e am: 20adc38129 am: d658e13ec5
…
Merge "Support comparison of byte array values in areBundlesEqual" into tm-dev am:
548c0800c2 am: bb5b8247d1
Merge "Consolidate input OWNERS files" am:
467ebb8379 am: 7845f672bf am: 8992cd567f am: e2754a0ede am: 36233bdf3a
…
…
…
…
…
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%