OSDN Git Service

Merge "ART: Fix interpreter single-step when doing OSR" am: dc80925 am: dc7e534
authorbuzbee <buzbee@google.com>
Fri, 8 Apr 2016 00:10:26 +0000 (00:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 8 Apr 2016 00:10:26 +0000 (00:10 +0000)
commit333a12c0803d6e8d0c0a64309ed9e2a50e5e0bae
treeb1c04f5d4dd57516338f4480ae3b61e43a423d2a
parent01736247970d699369759c2485f48750a8951b3b
parent64d84bc574d539b32b0903dd8c6fe84123fb618d
Merge "ART: Fix interpreter single-step when doing OSR" am: dc80925 am: dc7e534
am: 64d84bc

* commit '64d84bc574d539b32b0903dd8c6fe84123fb618d':
  ART: Fix interpreter single-step when doing OSR

Change-Id: Id93db5e7a2dce43357be42ca51b7517b470e9f7c