a5a44dd2146ec6d76edaff1486945529d34bc752
1424a20e59 -s ours
am skip reason: Merged-In Ice016370ab5b4a5ce99ca118eaace55426643422 with SHA-1 5c4aa4f2f7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14885855
Change-Id: Ib01b92c9e30775017bb487da0d8676a1fbf8ebfd
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 "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%