43e8b1793fd465df013c6a842c8b51eef75cc5ff
08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409 am: cee2a1fd34 -s ours
am skip reason: Merged-In I8e4425a4e7de716f86b1f1f56ea605d93f357a57 with SHA-1 e041621587 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080
Change-Id: I4c4f4c212b7d28c9f9206b029b7a7c0889932bd8
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 "Update data type and comments on tagSocket/untagSocket APIs" am:
ef89731cd3 am: aa82affbc0 am: 292d5f01ec
Merge "Migrate rs/jni to Soong" am:
eaebd2cd54 am: a6f5cf56e8 am: 21587435c7 am: 22b41229f1 am: 87bbc3ef20
…
…
Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am:
08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895
…
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%