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

[automerger skipped] Merge "DO NOT MERGE Add LOCAL_LICENSE_KINDS to... 

[automerger skipped] Merge "DO NOT MERGE Add LOCAL_LICENSE_KINDS to frameworks/base" am: 0cfaf8aa am: a184c0e8 am: 789850e9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I72b6a3018c353419d0e62ccb59fa5b0b66455c81
parents f41ba6b4 789850e9
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