[automerger skipped] Merge "DO NOT MERGE Add LOCAL_LICENSE_KINDS to frameworks/base" am: 0cfaf8aa1c am: a184c0e820 am: 789850e9b7 -s ours

Browse Source

am skip reason: subject contains skip directive

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

Change-Id: I72b6a3018c353419d0e62ccb59fa5b0b66455c81

...

This commit is contained in:

Treehugger Robot

2021-04-21 23:49:48 +00:00

committed by Automerger Merge Worker

parent f41ba6b483 789850e9b7

commit 0f3f55bb1c

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