[automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: 19f7526c3e am: dc8de2ce5a am: c16285c27c -s ours

Browse Source

am skip reason: Change-Id I823e093d400903202e5535188639dddd1a1f78a9 with SHA-1 354603079c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1af235deabc2a168c38052b11188145e23e6dd5f

...

This commit is contained in:

Treehugger Robot

2021-03-01 19:05:03 +00:00

committed by Automerger Merge Worker

parent 94691f3cbd c16285c27c

commit 55f3b80e97

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