be140917c69f2b418fe13bf654761d89291cae83
a2b92f89ec am: 40bb89325f am: aff1739e5d -s ours
am skip reason: Merged-In I377cab85a1b39ef2887b452d1ffcdc5b00a8d5ab with SHA-1 c55590c810 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2047905
Change-Id: I7a5305e6060aa0d601e922f0cc829105d3065b2a
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
…
…
…
…
…
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%