OSDN Git Service

(root) / android-x86 / art.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c4bc523 2b23735)
Merge "Revert "Write conflict tables in image"" into nyc-dev
authorMathieu Chartier <mathieuc@google.com>
Wed, 27 Apr 2016 21:31:30 +0000 (21:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Apr 2016 21:31:30 +0000 (21:31 +0000)
am: 2b23735

* commit '2b23735e23e18e1c96f02b1937068c6e6baefa6a':
  Revert "Write conflict tables in image"

Change-Id: I53aae313185812ddedcbfd5480776bf6de1644a5


Trivial merge
art
About OSDN
Find Software
Develop Software
Help