OSDN Git Service

Merge "ART: Allow --no-inline-from to specify multiple dex files."
authorVladimir Marko <vmarko@google.com>
Wed, 27 Jan 2016 18:33:38 +0000 (18:33 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 27 Jan 2016 18:33:38 +0000 (18:33 +0000)
commitca5050538cbb0260c50530055f1ea880015327b7
tree20520a5b5838b3251fd755584645d8ae85908b17
parent1be9e27239dc63bb4d8134df50be60f65a9d5da3
parent47496c293b2b79c9747eeebafe444715202e7fc6
Merge "ART: Allow --no-inline-from to specify multiple dex files."
compiler/driver/compiler_options.cc
compiler/driver/compiler_options.h
dex2oat/dex2oat.cc