Skip to content
Commit 1a737c45 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Partial cp of "Prepare role code for... 

[automerger skipped] Merge "Partial cp of "Prepare role code for modularization."" am: a81f292a am: e52b6cba am: 556944ee -s ours

am skip reason: skip tag Change-Id I74f20b37d23370e258e7fc7130e28c5312abf46c with SHA-1 0de31fe1 is already in history

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

Change-Id: I79fab0b97a30cf0ccf542aaac27ecf840ad3620a
parents 59634a7f 556944ee
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