OSDN Git Service

resolved conflicts for merge of a74a4811 to honeycomb-plus-aosp
authorYing Wang <wangying@google.com>
Thu, 11 Aug 2011 23:55:00 +0000 (16:55 -0700)
committerYing Wang <wangying@google.com>
Thu, 11 Aug 2011 23:55:00 +0000 (16:55 -0700)
commit6d38bdfc7b9ff699370b4a40dcbdddce0ea713b8
tree6e0ca998a952e5e447b46d454f2b8b1843218115
parentc55ebf232e1c0287ef841a5d917cb12feefba2d6
parenta74a4811ae46e24f73b3078c9b7bfe3c4861d03e
resolved conflicts for merge of a74a4811 to honeycomb-plus-aosp

Change-Id: I8400ac2bead6aa1a9902d44bf65906084ad353ad
tools/releasetools/check_target_files_signatures
tools/releasetools/common.py
tools/releasetools/ota_from_target_files