OSDN Git Service

resolved conflicts for merge of 813ad17a to master
authorDoug Zongker <dougz@android.com>
Fri, 17 Sep 2010 06:13:11 +0000 (23:13 -0700)
committerDoug Zongker <dougz@android.com>
Fri, 17 Sep 2010 06:13:11 +0000 (23:13 -0700)
commitb984ae51e578a16d7313d67328336547fa0fe6fe
tree38edb696debc503fa8f3a39cc401d251a00571c3
parent6821dbad65d0b28603a1e83b984beb0b9008cabc
parent813ad17ad3086c44332d3ee5e96a219994f632b0
resolved conflicts for merge of 813ad17a to master

Change-Id: I3fc84babbbcab712c5e38a0c8b815115ba89375f
core/Makefile
tools/releasetools/common.py
tools/releasetools/img_from_target_files
tools/releasetools/ota_from_target_files