[automerger skipped] Merge "Catch exception when unlinkToDeath" into tm-qpr-dev am: 9a5afdb60b am: 18b493725c -s ours
am skip reason: Merged-In Ifacb91d9e961b71df0ac41690b952be981711870 with SHA-1 af2eba80db is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19346886
Change-Id: I2ffc8f3fb2fa045acc367c49cd19e95bcc7eaffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: