Commit 105ac312 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I2814a0b8,I05a7961f into nyc-mr1-dev 

* changes:
  ART: Add dex2oat swap-usage parameters
  OatFileAssistantTest: do not relocate image randomly.
parents fd43db68 25a9abe3
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