OSDN Git Service

(root) / android-x86 / art.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 00b022c 6841e3f)
resolved conflicts for merge of 6841e3f3 to lmp-dev-plus-aosp
authorSebastien Hertz <shertz@google.com>
Fri, 12 Sep 2014 08:04:48 +0000 (10:04 +0200)
committerSebastien Hertz <shertz@google.com>
Fri, 12 Sep 2014 08:04:48 +0000 (10:04 +0200)
Change-Id: I2f115f3480022b39bff1f5d1ab6f3b9720bc3008


Trivial merge
art
About OSDN
Find Software
Develop Software
Help