OSDN Git Service

resolved conflicts for merge of 18c00c5c to master
authorYing Wang <wangying@google.com>
Tue, 28 Sep 2010 17:45:54 +0000 (10:45 -0700)
committerYing Wang <wangying@google.com>
Tue, 28 Sep 2010 17:45:54 +0000 (10:45 -0700)
commit421b46e0cb301019563c7ba1c797aa752fc318df
tree38530ce68abca3b7531f4030d0b14e92de74ef4f
parente54320d75998cbec4391be2b04c61164fa2d70fd
parent18c00c5c6abc9a3d781995ddd0225c7488f14ef4
resolved conflicts for merge of 18c00c5c to master

Change-Id: I7f6870b654e24a268a14b9c47eb8d384993273f2
core/Makefile
tools/releasetools/img_from_target_files