OSDN Git Service

resolved conflicts for merge of 7382ec7d to klp-dev-plus-aosp
authorYing Wang <wangying@google.com>
Mon, 27 Jan 2014 23:56:45 +0000 (15:56 -0800)
committerYing Wang <wangying@google.com>
Mon, 27 Jan 2014 23:56:45 +0000 (15:56 -0800)
commit04cff70804810d27e1fcbef556ebfdc39278d746
tree29aff8041d37a43365c4ce83fd967ffc78a4a7ec
parentae49acbde766e2e683d3dd026e69f2416da766b1
parent7382ec7db88736ec2cb4a3236a42d2baac409827
resolved conflicts for merge of 7382ec7d to klp-dev-plus-aosp

Change-Id: Ic414d3ec8b52b1045125e1b76deae8a4a59a5e52
tools/releasetools/ota_from_target_files