e60c3ae3252dcb67ec058bfd41707d075d4b60b5
28d4a8f2af am: 15bcb7c340 am: 6c1afe25c5 -s ours
am skip reason: Merged-In I53e40af53aa00ff493e8e5050908220ae4dad729 with SHA-1 b5df9c503a is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2065616
Change-Id: I11814eed0d76015861f48755baf3b5da1dde55da
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 "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%