OSDN Git Service
(root)
/
android-x86
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d35dcb9
2abbbd0
)
resolve merge conflicts of 2abbbd0 to nyc-mr1-dev-plus-aosp
author
Tao Bao
<tbao@google.com>
Fri, 24 Jun 2016 02:48:40 +0000
(19:48 -0700)
committer
Tao Bao
<tbao@google.com>
Fri, 24 Jun 2016 02:48:40 +0000
(19:48 -0700)
Change-Id: I2d06f0cec793185533ef2fc78428dfd99815030c
1
2
tools/releasetools/ota_from_target_files.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
tools/releasetools/ota_from_target_files.py
Simple merge
OSDN Git Service
