OSDN Git Service

(root) / android-x86 / art.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e6bb41f 1f4364d)
Merge "Add an ImtConflictTable to better resolve IMT conflicts."
authorNicolas Geoffray <ngeoffray@google.com>
Wed, 23 Mar 2016 01:00:17 +0000 (01:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 23 Mar 2016 01:00:17 +0000 (01:00 +0000)
am: 1f4364d

* commit '1f4364d180d231a7d086eb0641deec30f71d02e6':
  Add an ImtConflictTable to better resolve IMT conflicts.

1  2 
runtime/class_linker.cc patch | diff1 | diff2 | blob | history

diff --cc runtime/class_linker.cc
Simple merge
art
About OSDN
Find Software
Develop Software
Help