OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f35ed6b 1b74805)
resolved conflicts for merge of 1b748051 to lmp-mr1-ub-dev
authorMohamad Ayyash <mkayyash@google.com>
Wed, 24 Jun 2015 22:04:38 +0000 (15:04 -0700)
committerMohamad Ayyash <mkayyash@google.com>
Wed, 24 Jun 2015 22:04:38 +0000 (15:04 -0700)
1  2 
tools/releasetools/common.py patch | diff1 | diff2 | blob | history

diff --cc tools/releasetools/common.py
Simple merge
build
About OSDN
Find Software
Develop Software
Help