OSDN Git Service

(root) / android-x86 / art.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ce07dd e42888f)
Merge changes I38cbe315,Ia05cb31f
authorMathieu Chartier <mathieuc@google.com>
Wed, 27 Apr 2016 20:51:10 +0000 (20:51 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 27 Apr 2016 20:51:10 +0000 (20:51 +0000)
* changes:
  Write conflict tables in image
  Add support for eagerly calculating conflict tables


Trivial merge
art
About OSDN
Find Software
Develop Software
Help