Skip to content
Commit 6c7a166d authored by Christian Wailes's avatar Christian Wailes Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Add LocalManagerRegistry inside system server."... 

[automerger skipped] Merge "Add LocalManagerRegistry inside system server." am: 76348ffa am: 4eb5f086 am: 7f037415 -s ours

am skip reason: Change-Id Ib9f14070a665ebd8c582376d7ea044d9b945b6b0 with SHA-1 bd47187f is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifdb9865dee2a05f241a973140f162e58b6efb8bc
parents af645c31 7f037415
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