OSDN Git Service

Merge "ART: Fix race in on-stack replacement" am: 250a23c
authorBill Buzbee <buzbee@google.com>
Fri, 8 Apr 2016 17:52:25 +0000 (17:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 8 Apr 2016 17:52:25 +0000 (17:52 +0000)
commit085b698d555c465d96348f23aa816a0bfa40cb5b
treeca2327c81c58bc3647126dbba9fc09c4d949a0c1
parent58b0a24a2781348a364dcaeb44b22efe6484e581
parent4766a4af2bd5e3fe8433fe758db94921b6b1bb15
Merge "ART: Fix race in on-stack replacement" am: 250a23c
am: 4766a4a

* commit '4766a4af2bd5e3fe8433fe758db94921b6b1bb15':
  ART: Fix race in on-stack replacement

Change-Id: Ib7fd162bdbd4ea62e1803a7420435a140c566456
runtime/jit/jit.cc