OSDN Git Service

(root) / android-x86 / art.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c9ed937 bf3cc9e)
resolved conflicts for merge of bf3cc9e0 to mnc-dev-plus-aosp
authorRoland Levillain <rpl@google.com>
Fri, 7 Aug 2015 21:12:22 +0000 (22:12 +0100)
committerRoland Levillain <rpl@google.com>
Fri, 7 Aug 2015 21:12:22 +0000 (22:12 +0100)
Change-Id: I6079eac15e82065c437391ea5d7491226925c066


Trivial merge
art
About OSDN
Find Software
Develop Software
Help