ab78caa5a454d9bf034ebe2246847e3f7c5f5f36
e97d1f5484 -s ours am: e100b24420 -s ours am: 0c2eb39dfb -s ours am: f793f6516e -s ours am: dbd1da95f1 -s ours am: fd8d4cc567 -s ours
am skip reason: Merged-In I7b43940dc32826c70fa82f471b35bc5cb8394aad with SHA-1 c737926795 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14486206
Change-Id: Ied446e19a1727707b98484b73dcbb40221058f88
Merge "Fix the path of boot image profile and preloaded classes for frameworks." am:
0e52d9c6f9 am: 43927fdefc am: 1938444d6c
Merge "Remove unnecessary entries in frameworks/base/config/OWNERS" am:
a2baa71441 am: e9ec371853 am: a8329471e4
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am:
7226ad3729 am: a087245e03 am: 3dd40d172b
Merge "Use keymasterSwEnforcedUserAuthenticators if keymasterHwEnforcedUserAuthenticators is zero." am:
3b2decbb34 am: bc9360ea4e am: 791f088436
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am:
7226ad3729 am: a087245e03 am: 3dd40d172b
Merge "AudioTrack: 24 channel index masks, compressed formats" am:
e477e9686f am: dd8fa96c01 am: fde2ef0250
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am:
7226ad3729 am: a087245e03 am: 3dd40d172b
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am:
7226ad3729 am: a087245e03 am: 3dd40d172b
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 "Apply the same filtering for docstubs and jarstubs" am:
46dff8e09f am: 8f1928f4ca am: 9e8186aaaf
…
…
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%