4ec14cc958a9ce18d441873344fda7071db26468
7ba3a378c5 am: 1f68b323f3 am: 59378118d7 am: 6b1bf26b0b am: 2eb95344c5 -s ours am: 57836676ac -s ours am: 2770c3c39b -s ours
am skip reason: Merged-In I7f9a1d9afd2a40762e9fac68edf1fb8ae75df8bc with SHA-1 520cc2fde3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18279994
Change-Id: Ie641f3e3130fb1cc36f0c18aaac33ce660109d80
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
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
…
…
Merge "Don't bring the Task to front when launching placeholder in background" into tm-dev am:
721a2e8fc6 am: 6efc298a16
…
…
…
Merge "Show mobile data icon with carrier Wi-Fi level in Quick-Settings" into tm-dev am:
f596386556 am: 72645f44b2
…
…
Merge "Add an option, --reset-all, to dumpsys batterystats." into tm-dev am:
512b28faf4 am: 9c53571bee
…
…
…
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%