tree f4f4d983514a4b9a86a75164c94c84b26330d6f5
parent 29209af871d2eb24072b93e294c8bb9e6f03abff
parent e8626dee4272d1f0f8760929f4eb31e21375e251
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1517457822 +0000
committer android-build-merger <android-build-merger@google.com> 1517457822 +0000

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

Change-Id: Ia800a77c6c172770726e4fd2a132137ae209eb45