OSDN Git Service

(root) / android-x86 / art.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d06a009 9d2b9cb)
Merge "Fix build break from merge conflict" am: c13fbeb220 am: dfd6e355c9
authorMathieu Chartier <mathieuc@google.com>
Wed, 5 Oct 2016 01:01:32 +0000 (01:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Oct 2016 01:01:32 +0000 (01:01 +0000)
am: 9d2b9cb0e8

Change-Id: Iccbf744b226ce67194c6dc7afa42e09e44e3e7a4


Trivial merge
art
About OSDN
Find Software
Develop Software
Help