d9f22fa3d03ea4d699e54d896d836538204ef079
6166d7a7af
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17583383 Change-Id: Ic2a4b0c8d13654a6c18125e5ee4f9a72a286522c 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 "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am:
7226ad3729 am: a087245e03 am: 3dd40d172b
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 changes from topics "presubmit-am-7ed5c317d7b347f1a59eb332f20e8522", "presubmit-am-86ce18b053454a4db98a349f8b39985e", "presubmit-am-94d3142a4e1c418fadfd6eca6208920a", "presubmit-am-a466ed1382304d549cb550a5cae804e6" into tm-dev am:
a62f32758c
Merge "Trigger revalidation of VCN, underlying networks" am:
bd14581e6b am: 4755021eb1 am: 3e2628d028
…
…
Merge "Move hiddenapi sort preupload tools to tools/platform-compat" am:
b82853357b am: 89aedd6cb8 am: af77c134d9
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%