OSDN Git Service

(root) / android-x86 / art.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 66b6ce3 07f7aff)
Merge "Fix build aflter conflicting changes got in."
authorNicolas Geoffray <ngeoffray@google.com>
Thu, 18 Feb 2016 18:23:52 +0000 (18:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 18 Feb 2016 18:23:52 +0000 (18:23 +0000)
am: 07f7affb33

* commit '07f7affb338b529d34e4e18b7e8a631c16bd9765':
  Fix build aflter conflicting changes got in.


Trivial merge
art
About OSDN
Find Software
Develop Software
Help