492d95323bacd36054941751f5aa82f8721d7b40
bf3953a627 -s ours
am skip reason: Merged-In I7fd4b6dad1a4363336f03c217e635fc45bcd0ab6 with SHA-1 4b6b7987a1 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18112115
Change-Id: Ib6e25276457c4c3178c1e4470a21639c12143b64
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
…
…
DO NOT MERGE: Downbranch merge conflict [Output Switcher] Change checked state to a filled one am:
60cdc0c439
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%