8287d226ae1d834cbd7d5f8157771da063662481
c3580425a7 am: b8ea68c299 am: 1906fd1b2f -s ours
am skip reason: Merged-In I3d5327bf4acd9c043483ace7b89576801b9e4ef1 with SHA-1 a6e49349d8 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2065613
Change-Id: Id3bd6430d270e4deee7076d40b365aa7b6c8ebfd
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 "Clarify doc comment for setUnlockedDeviceRequired" am:
a0976a1207 am: f6354a20d5 am: 9025d607a0
…
…
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 "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%