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

Merge "Change resource claim to sync to avoid resource conflict" am: f8d76455 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifb184d9db19a52f1e9fffee93293be8ec9f7df7b
parents 6a62906e f8d76455
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