OSDN Git Service

resolved conflicts for merge of e1daf61d to master
authorDoug Zongker <dougz@android.com>
Wed, 22 Sep 2010 03:10:32 +0000 (20:10 -0700)
committerDoug Zongker <dougz@android.com>
Wed, 22 Sep 2010 03:10:32 +0000 (20:10 -0700)
commit539db3b845bba83b6e1340818b19f7581c3b6bc0
treecbfb58f558b829fc332544a6381966e26bfc51ab
parent58118ccc565db991cd82ae5f4cbd0a5057438dbc
parente1daf61d43a4252594e1e51060f342480ea26d42
resolved conflicts for merge of e1daf61d to master

Change-Id: Idf5767f68dd19b51940ea69528cdd389b04d56b9
tools/releasetools/img_from_target_files