67ca30e2a65f4fe6d9953134ef52e4ecf9b392ae
cf608908b3 -s ours am: 491e17f146 -s ours
am skip reason: Merged-In Ice516a0ab0819c4a076c394c05be1643461d4309 with SHA-1 b8b46fde2a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17522965
Change-Id: I476072a90d65e81b46a4b98ba3c9099d5c306b02
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 "Fix issue where cold-start launching an activity from the shade while an occluding activity is visible would result in an inescapable black screen." into tm-dev am:
d35b3ee16a
Merge "Migrate rs/jni to Soong" am:
eaebd2cd54 am: a6f5cf56e8 am: 21587435c7 am: 22b41229f1 am: 87bbc3ef20
…
…
Merge "Trigger revalidation of VCN, underlying networks" am:
bd14581e6b am: 4755021eb1 am: 3e2628d028
…
…
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%