tree 15d2f5f9a1d913107a4634bb6edcebd34df6310b
parent 1d32a16f93d8bb479523fd237277ecbbff5bf1f4
parent 21f9cb88932fc321427f41256b154dc626233a6f
author Treehugger Robot <treehugger-gerrit@google.com> 1514407371 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1514407371 +0000

Merge changes I4f6de0af,Id6805e03

* changes:
  ART: Disable watchdog test for non-CC
  Revert "ART: Add barrier to dex2oat watchdog startup"