tree 8609812b2e75b1938e387e5e2001f3e8982f82db
parent cf33fd791073fa89826f1bed4a6045083d89bbcc
parent 010d0be575bf4151a4a17dbf12db76e9256f6009
author Martijn Coenen <maco@google.com> 1483002742 +0000
committer android-build-merger <android-build-merger@google.com> 1483002742 +0000

Merge "Add (un)linkToDeath support to HwBinder." am: 7705363166
am: 010d0be575

Change-Id: Ibabccaf8555bd0229add18a798bff685c6a1c433