tree 4d312e7323d4ac98911d2ca09b309e645260b0cf
parent 908d214f7dc2259d44884152a230546415ab0bb7
parent 921f6eb2028fa58c24a3c5c03964800f1414ddff
author Aart Bik <ajcbik@google.com> 1524116775 -0700
committer android-build-merger <android-build-merger@google.com> 1524116775 -0700

Merge "Revert "Deopt does not throw"" am: cee4928036
am: 921f6eb202

Change-Id: I95fb6b379f9ab5791fc1ad24fd8d399db51ced15