43ec497b831094e6e0e6fbfcf7083de0b73739a8
c4d258d8b1 am: b6cff0c175 -s ours am: 54f95db1cf -s ours am: 5e30a6efba -s ours am: e6c523f7e3 -s ours am: e5c7a29b7e -s ours
am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 b479180b73 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19497893
Change-Id: I1f3bbca018fcaee508724f4b95efefe2d0f6a099
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 exfiltration of system files via user image settings."" into sc-dev am:
53738ccfb3 am: 425d0d6592
…
…
…
…
…
…
…
…
…
…
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%