OSDN Git Service

(root) / android-x86 / art.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3076fc1 d3db28a)
resolved conflicts for merge of d3db28a4 to lmp-dev-plus-aosp
authorCalin Juravle <calin@google.com>
Fri, 15 Aug 2014 13:41:48 +0000 (14:41 +0100)
committerCalin Juravle <calin@google.com>
Fri, 15 Aug 2014 14:12:39 +0000 (15:12 +0100)
Change-Id: Ibc0771343762a8d1bf875c36262d9cda896e4d2b

1  2 
runtime/runtime.cc patch | diff1 | diff2 | blob | history

diff --cc runtime/runtime.cc
Simple merge
art
About OSDN
Find Software
Develop Software
Help