tree 8e0600c4e0121c82ccf86fa32fbe3ee279112f81
parent ab4332d6161338959b0f6951989e847b7c2d3b6b
parent c1aa80ab445220831a0740b65dcd705931251422
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1517457846 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1517457846 +0000

Merge "Merge "Merge "Revert "Revert "Make AndroidRuntime only start the debugger for zygote forked apps.""" am: 3b50dc3d34 am: 98568f57ad" into oc-mr1-dev-plus-aosp am: e8626dee42"