OSDN Git Service

(root) / android-x86 / art.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 186c07f 76e1722)
resolve merge conflicts of 76e1722 to nyc-mr1-dev-plus-aosp
authorAlex Light <allight@google.com>
Fri, 9 Sep 2016 23:01:17 +0000 (16:01 -0700)
committerAlex Light <allight@google.com>
Fri, 9 Sep 2016 23:01:17 +0000 (16:01 -0700)
Change-Id: I4a010406f0745353974b962e79b6f92334311b9b


Trivial merge
art
About OSDN
Find Software
Develop Software
Help