9946909c8730163ebba9c7df451de71dc5498be7
3ffed0bca8 am: bc0edaae72 am: 3b3d2597ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349555 Change-Id: I160a3c43ec99ecaf4498e062e70a58e61ba52586 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merge "Fix IME callback not being re-registered on screen off / on." into tm-dev am:
bd7ac0c646 am: 19220d853a am: ad8e47338c
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 changes from topic "colorSchemeChanges" into tm-dev am:
e320ce441d am: b185ee027b am: 56d3315b3c
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
…
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%