e32cd0cf11412601fe899445f4b70f0e5d31d7e7
d2ff4985e1 -s ours
am skip reason: Merged-In I665b8c6a131ff3fd66701fea7ca6368e33b39c13 with SHA-1 59d49a4238 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18151283
Change-Id: I09b20e1a9609dd46371c48a819c3dded2d641855
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merge "Camera: Fix typos and bad format in docs" into tm-dev am:
b1d13ce6bd am: f662a50fb4 am: 5b87cbc640
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 "Revert "Move PiP when it occludes a keep clear area with naive a..."" into tm-dev am:
afc9fd279d am: 56375b707c am: a9c3f08998
…
…
Merge "Migrate rs/jni to Soong" am:
eaebd2cd54 am: a6f5cf56e8 am: 21587435c7 am: 22b41229f1 am: 87bbc3ef20
…
…
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%