2c90b00ed00563ea8abd503637dcb56853eb7271
3ab9dc113e am: 5f72388c49 -s ours am: c63b0311a6 -s ours am: 74c35b4663 -s ours am: 34842572ca -s ours am: aa7e540eff -s ours am: 5afbc7f257 -s ours
am skip reason: Merged-In Ie9d4a28008adc93e27bc8ab015a3a6507428c3e4 with SHA-1 2f9987f507 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17415776
Change-Id: I3608868cacabe6b92cb2a606e16fb2971c23347b
Ignore-AOSP-First: this is an automerge
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%