[automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: fcf6560011 am: fc00dda2e9 -s ours

Browse Source

am skip reason: Change-Id I6e9103c3275cb2e6df5dc586588eccd7d2ab6b06 with SHA-1 47bc43a414 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1588961

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7396eb4c772714f142c2c1f3831efa533772159b

...

This commit is contained in:

Treehugger Robot

2021-02-16 15:56:35 +00:00

committed by Automerger Merge Worker

parent 057bac2724 fc00dda2e9

commit 70d6495d4d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available