f2fa50a0591797b296397d756c37eecc7ce607c7
fefefdc7ff am: bc227f010a am: 487c65ea5d am: e910cac05e -s ours am: 0ed5ea2550 -s ours
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19336830
Change-Id: Ie2e15e5ba2e93ebc9adbf26d202407019494b413
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 "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am:
fefefdc7ff am: bc227f010a am: 487c65ea5d
…
…
…
…
…
…
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%