02cbac088a90c95a2bfe1d7c8aa6a8b3eb57ca3c
af4ba70aaa -s ours am: 4f71164e72 -s ours am: 1f5201f776 -s ours am: 95fc07b7cb -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18110470 Change-Id: Ieed2dfdc82643a056eedbf515ebbda53f26f3196 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merge "More robust restorecon and additional debug info." into tm-dev am:
8169e839ca am: a18cf5d20f am: 4225882ed8
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 "Revert "[SettingsProvider] enforce permission on openFile""" into tm-dev am:
d42fff5d21 am: 00871b04b4 am: cdeca6273c
Merge "Migrate rs/jni to Soong" am:
eaebd2cd54 am: a6f5cf56e8 am: 21587435c7 am: 22b41229f1 am: 87bbc3ef20
…
…
Merge "TaskFragmentParentInfo should be updated for LTR/RTL changes" into tm-dev am:
4e073427ed am: 8ffffd65b5 am: fa50a9797d
…
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%