OSDN Git Service

resolved conflicts for merge of 2cb8d5eb to master
authorDoug Zongker <dougz@android.com>
Thu, 16 Sep 2010 19:38:40 +0000 (12:38 -0700)
committerDoug Zongker <dougz@android.com>
Thu, 16 Sep 2010 19:38:40 +0000 (12:38 -0700)
commitf127eb709b9a9fb9b04cda0cb7ef96ca65768ec8
tree71c5cddf0fb9fa200eeab01a2bdf7a13780b46c0
parent2e8730e341479dd658810bdbd46df2314129437b
parent2cb8d5ebb2a5bc45704108958ba94f85106c0209
resolved conflicts for merge of 2cb8d5eb to master

Change-Id: I3b1aec1aee7c6bfcee2e978b4755b2bae9e480c4
core/Makefile
tools/releasetools/img_from_target_files
tools/releasetools/ota_from_target_files