OSDN Git Service

(root) / android-x86 / art.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 85e4797 91288d8)
Merge changes Ia94fc7ac,Iffd25c5f
authorMathieu Chartier <mathieuc@google.com>
Thu, 28 Apr 2016 23:03:05 +0000 (23:03 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 28 Apr 2016 23:03:05 +0000 (23:03 +0000)
* changes:
  Revert "Revert "Write conflict tables in image""
  Revert "Write conflict tables in image"


Trivial merge
art
About OSDN
Find Software
Develop Software
Help