OSDN Git Service

Merge \\"ART: Add ATRACE section for collision check\\" am: 531e86c888
authorAndreas Gampe <agampe@google.com>
Fri, 10 Jun 2016 16:44:26 +0000 (16:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 10 Jun 2016 16:44:26 +0000 (16:44 +0000)
commit438a41b9a4f621ccec29650e75bc29183acc5977
tree7033633d8640fc24835847c56e26a81367db1b77
parent8e7ac72875154f64ab8b46246f0264579762f5de
parentb90c1aa0dbce20b5fbe8f86ecfc07b4050d38856
Merge \\"ART: Add ATRACE section for collision check\\" am: 531e86c888
am: b90c1aa0db

Change-Id: I014ebeae4f4201cc3d721f16caa1936018c44289
runtime/oat_file_manager.cc