tree ac3b5775c8e124a196e5723936c36c2f2b8fd67a
parent 78d558585b63f62efcd317fdba1552f6464e833b
parent 22c13e1205af06724725f182bd737a9cac4118da
author Nicolas Geoffray <ngeoffray@google.com> 1450196296 -0800
committer android-build-merger <android-build-merger@google.com> 1450196296 -0800

Merge "Revert "Make the JIT the default in ART."" am: 3b0ec01718
am: 22c13e1205

* commit '22c13e1205af06724725f182bd737a9cac4118da':
  Revert "Make the JIT the default in ART."