tree dbf2c1e2f9628d20d25635b7105e0c982662eb8d
parent c90c5ca039fe42fc34be4ee3eed19cc2207de4f0
parent ae148af696dd464024e583e9cde13d0d93318a37
author Mathieu Chartier <mathieuc@google.com> 1463001398 +0000
committer android-build-merger <android-build-merger@google.com> 1463001398 +0000

Merge "Prevent ArtMethod clearing race" am: d6f3740718
am: ae148af696

* commit 'ae148af696dd464024e583e9cde13d0d93318a37':
  Prevent ArtMethod clearing race

Change-Id: I71cc6d9f5093bf7616f745d0b54f69994122eeeb