OSDN Git Service

am d75383af: am 5e8a63ae: Merge "ART: Do not recursively abort when visiting locks...
authorAndreas Gampe <agampe@google.com>
Mon, 18 Aug 2014 05:19:46 +0000 (05:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 18 Aug 2014 05:19:46 +0000 (05:19 +0000)
commit3b18f257344f911d7223bd36b90d1a4ad5331933
tree93970f631b75ce62208625bfa06b1d60e9f59884
parent517e1e72e50bc30f438ef3826a37213e4ee65dbd
parentd75383af2f0843ecd2f493fd64b4eb38630c6071
am d75383af: am 5e8a63ae: Merge "ART: Do not recursively abort when visiting locks in a bad state" into lmp-dev

* commit 'd75383af2f0843ecd2f493fd64b4eb38630c6071':
  ART: Do not recursively abort when visiting locks in a bad state
runtime/monitor.cc
runtime/monitor.h
runtime/thread.cc