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

[automerger skipped] Merge "Change resource claim to sync to avoid resource... 

[automerger skipped] Merge "Change resource claim to sync to avoid resource conflict" am: f8d76455 am: 7155480d am: dd7204ab -s ours

am skip reason: Change-Id Ib2688da2a85cdad896f9f2814828ce7659c8a695 with SHA-1 e882c08a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I104c93302f721de7f8fa0ff6445acb1f33c1361f
parents 16c13f52 dd7204ab
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