184f594893a113b852864c0b2bb601c52ef887cb
6fff3df429 -s ours am: 046ba845e6 -s ours
am skip reason: Merged-In I7196d62bb60844458a6c4b1d94e2baccb71e15cd with SHA-1 559d4ec575 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622495
Change-Id: I1aca453aad83a38deb0bf56646b6e302e0945ba7
Merge "Fix the path of boot image profile and preloaded classes for frameworks." am:
0e52d9c6f9 am: 43927fdefc am: 1938444d6c
…
…
…
…
Merge "Use keymasterSwEnforcedUserAuthenticators if keymasterHwEnforcedUserAuthenticators is zero." am:
3b2decbb34 am: bc9360ea4e am: 791f088436
…
Merge "AudioTrack: 24 channel index masks, compressed formats" am:
e477e9686f am: dd8fa96c01 am: fde2ef0250
…
…
Merge "SettingsLib logic for updated ActionDisabledByAdminDialogHelper" into sc-dev am:
392fd855a4 am: 9530b4a0a7
…
…
…
…
…
Merge "Use filegroups for test-{base,mock,runner} srcs" am:
af9b5f0a04 am: 06e56695cc am: 4eecbfcd41
Merge "Use filegroups for test-{base,mock,runner} srcs" am:
af9b5f0a04 am: 06e56695cc am: 4eecbfcd41
Merge "Move IoUtils#deleteContents from CorePlatformApi set to framework" am:
a4466fbe61 am: 719831b948
…
…
Merge "Apply the same filtering for docstubs and jarstubs" am:
46dff8e09f am: 8f1928f4ca am: 9e8186aaaf
…
…
…
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%