c26caf678fa6b472682920de9ef4e7154fa94a27
74592430e2 -s ours am: 98ba0a3f7a -s ours am: 0511109afb -s ours am: 9d000dcf5f -s ours am: 9a382decde -s ours am: 74c103467a -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 538654167a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19943344
Change-Id: Iea282f303ec674cc72d151d45630731ddfdce71e
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 "Add instructions on how to annotate an AIDL interface" am:
b6df9fb2e8 am: b691d9ce36 am: 9e7a44c173 am: 3ced8e8092
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am:
7226ad3729 am: a087245e03 am: 3dd40d172b
Merge "Migrate rs/jni to Soong" am:
eaebd2cd54 am: a6f5cf56e8 am: 21587435c7 am: 22b41229f1 am: 87bbc3ef20
…
Merge "Remove unused empty filegroups from frameworks/base." am:
5ee9c55130 am: 76e9b955c5 am: 735d0192f6
…
Merge "Move hiddenapi sort preupload tools to tools/platform-compat" am:
b82853357b am: 89aedd6cb8 am: af77c134d9
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%