a4f08063df3875aa6f7eb3002b28bbaa126a27b2
8625d03046 -s ours am: 5528905c70 -s ours am: 881b8abdcf -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090330 Change-Id: I930c6937f23c72484751ffde30cf1122c8a0d373 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merge "Avoid calling updateSurface twice when dimming is applied." into tm-dev am:
bc99f623d4 am: fa9f19cff0 am: add6e383a4
Merge "Add TaskFragmentOrganizer#onActivityReparentToTask" into tm-dev am:
0b91be7283 am: 0676135870
…
…
Merge "Add instructions on how to annotate an AIDL interface" am:
b6df9fb2e8 am: b691d9ce36 am: 9e7a44c173 am: 3ced8e8092
…
…
Merge "Migrate rs/jni to Soong" am:
eaebd2cd54 am: a6f5cf56e8 am: 21587435c7 am: 22b41229f1 am: 87bbc3ef20
…
…
Merge "Pass NO_USER_ACTION activity option along to shell transition" into tm-qpr-dev am:
5f49a6b8cf
Merge "Update Api docs for ProvisioningManager#get[Rcs]ProvisioningStatusForCapability and is[Rcs]ProvisioningRequiredForCapability." into tm-dev am:
f1c5479dab
…
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%