Skip to content
Commit b3ff4ac6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base"... 

[automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: fcf65600 am: fc00dda2 -s ours am: 70d6495d -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0dcff72fd2a921e9e781acd5ffbb19a8a6a7c98c
parents 7e24b8be 70d6495d
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment