Commit b2e60900 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I4f6de0af,Id6805e03 

* changes:
  ART: Disable watchdog test for non-CC
  Revert "ART: Add barrier to dex2oat watchdog startup"
parents 1d32a16f 21f9cb88
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment