Skip to content
Commit f19305b7 authored by Pinyao Ting's avatar Pinyao Ting Committed by Automerger Merge Worker
Browse files

Merge "Fixes an edge case which leads to deadlock in ShortcutService" into... 

Merge "Fixes an edge case which leads to deadlock in ShortcutService" into tm-qpr-dev am: 40ab17b0

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



Change-Id: Ib7acce47bc88c5e0484f07257618a13f53a517f4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 99561792 40ab17b0
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