OSDN Git Service

Merge changes I2814a0b8,I05a7961f into nyc-mr1-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Wed, 29 Jun 2016 16:01:21 +0000 (16:01 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 29 Jun 2016 16:01:21 +0000 (16:01 +0000)
commit105ac3120306bf749f46a70f2c81d084db36420b
tree78b7706b348d1344d9ea5ab4389b99d51ff3a92b
parentfd43db68d204caaa0e411ca79a37af15d1c001af
parent25a9abe3cd9594a60d353c0277b4f9e49a71a40a
Merge changes I2814a0b8,I05a7961f into nyc-mr1-dev

* changes:
  ART: Add dex2oat swap-usage parameters
  OatFileAssistantTest: do not relocate image randomly.