OSDN Git Service

resolved conflicts for merge of 16d03c4b to lmp-dev-plus-aosp
authorAndreas Gampe <agampe@google.com>
Fri, 22 Aug 2014 17:46:27 +0000 (10:46 -0700)
committerAndreas Gampe <agampe@google.com>
Fri, 22 Aug 2014 17:46:27 +0000 (10:46 -0700)
commitd2d1ce1aa58c63a65de69f02601061585d3fefcf
tree057b7ba89988f679a38d0ce876213dc01039c1ea
parent4dfa161bf9fda1834b57bdbeebf6991f852c765d
parent16d03c4b6f9fbc90fa58442c9877cd88804a5a00
resolved conflicts for merge of 16d03c4b to lmp-dev-plus-aosp

Change-Id: I2c698068bbf2e0b827d6dcb788619a0058f3f8c7
runtime/oat_file.cc