Skip to content
Commit c4a6a590 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "ServiceManager: waitForService uses allowBlocking" am:... 

Merge "Merge "ServiceManager: waitForService uses allowBlocking" am: b801a513 am: 726c374f" into sc-dev-plus-aosp am: 578d06c9 am: 42be3a64

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

Change-Id: Ieaf244c57398205c961d27ba7608bbbc8793321e
parents d04af4e0 42be3a64
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