tree 740b92fefb33f3cfe49aec38954ac0ba21284cd5
parent 308c132c2a65e6f112307db5aa1a8f8afbe2fc47
parent 4bfb891a7b7799ac8b3358053636b6fa769de67f
author Josh Gao <jmgao@google.com> 1494032896 +0000
committer android-build-merger <android-build-merger@google.com> 1494032896 +0000

Merge "Make raise/abort work with stale cached pid/tid values." am: 1f9e648878 am: 3537fa1c45 am: 8a84a0fa1a
am: 4bfb891a7b

Change-Id: I9e566568afa4035d3e6e823c8c072f6ae08d62e7