Skip to content
Commit 67ce114b 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 am: f19305b7

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



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