569cbb8d4e502a58ad8d2353b5cd5c025fcede34
4da674b517 -s ours
am skip reason: Merged-In I38469ad5df100e90aba81bbdc82078b568301f09 with SHA-1 0b488bfdb2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15927319
Change-Id: I6d53dbe5d7e860b4f4551f22bbcac099abb8fdea
Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am:
7226ad3729 am: a087245e03 am: 3dd40d172b
…
Merge "Adjust OWNERS to reflect new ownership" am:
ead9d53764 am: 81115930fa am: 55f3beebb2 am: 8d70e9f514
…
Merge "Update API docs for "is_ims_conference_size_enforced_bool" key." am:
be88f1fa54 am: 5a6034c220 am: 7aeb5707f2 am: b0dd57501f
Merge "Fix framworks/base compiling against musl" am:
2cba49ac56 am: d5b3d74850 am: 1559860d81 am: 4ebc6b077f
…
…
…
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%