a0d9e59656d4ca1f306dc97bd0d934f04b04f77a
abf1cfa4ec -s ours am: f6f4800b6c -s ours am: 08e240c3b1 -s ours am: aba2a82d08 -s ours am: 1ce1c06835 -s ours am: 8724128895 -s ours
am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 baca9125f1 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20193625
Change-Id: Ia2a3d758537cdf66d783841bae2e417179c7e543
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 "Fix sharing to another profile where an app has multiple targets" into rvc-dev am:
59a63e8062 am: eec74eb462 am: f0027983a0 am: b926b8ec95
…
…
Merge "Add instructions on how to annotate an AIDL interface" am:
b6df9fb2e8 am: b691d9ce36 am: 9e7a44c173 am: 3ced8e8092
…
…
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
…
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%