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:
c55ebf2
a74a481
)
resolved conflicts for merge of a74a4811 to honeycomb-plus-aosp
author
Ying Wang
<wangying@google.com>
Thu, 11 Aug 2011 23:55:00 +0000
(16:55 -0700)
committer
Ying Wang
<wangying@google.com>
Thu, 11 Aug 2011 23:55:00 +0000
(16:55 -0700)
Change-Id: I8400ac2bead6aa1a9902d44bf65906084ad353ad
1
2
tools/releasetools/check_target_files_signatures
patch
|
diff1
|
diff2
|
blob
|
history
tools/releasetools/common.py
patch
|
diff1
|
diff2
|
blob
|
history
tools/releasetools/ota_from_target_files
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
tools/releasetools/check_target_files_signatures
Simple merge
diff --cc
tools/releasetools/common.py
Simple merge
diff --cc
tools/releasetools/ota_from_target_files
Simple merge
OSDN Git Service
