f892feea5bd6ce8a08d0a87c8650ab5959c449af
4952525b1c am: 17dc885001 -s ours
am skip reason: Merged-In I1526853951bcffbe5c5aec6fbc6ba8e0dbea95ad with SHA-1 fe09091214 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1701485
Change-Id: Ibeb1f2a0e83ef90f3ce095b6e8db9c41b9f5ec8c
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 "[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 "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%