11701d474dde2bc206887d5b8b7fb747a4e8f3da
a5f8393d76 -s ours am: 48aeb313ce -s ours am: b322c291cc -s ours
am skip reason: Merged-In I236b039c4fbbbfb519ba1432326bba9a89d008c2 with SHA-1 853dd7d2b6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18367823
Change-Id: I0bfb0ca87fc7f9271a4e76cade1f6ae9acfcbebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
…
…
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%