tree b980796550d5a5db6ded099743263ead765c9375
parent 7cc326b05b6cd5185f9d9442c496d30311df6cbd
parent cb63244206d03bcacc3fac56232e20af5769ca55
author Todd Kennedy <toddke@google.com> 1493905111 +0000
committer android-build-merger <android-build-merger@google.com> 1493905111 +0000

Merge "ignore exception calling unlinkToDeath" into oc-dev am: 79777a5b43
am: cb63244206

Change-Id: I1ed85c606e688acc20b61ada0fe07978e3e296be