OSDN Git Service

resolved conflicts for merge of 8787cd6d to mnc-dev
authorTao Bao <tbao@google.com>
Thu, 2 Jul 2015 01:06:33 +0000 (18:06 -0700)
committerTao Bao <tbao@google.com>
Thu, 2 Jul 2015 01:06:33 +0000 (18:06 -0700)
commit8bd720257eeaf9bf28b2dc8a36b856ccc30b1e8c
tree2676dec08ec9e787d93a6d180b77c09fc0a4c6eb
parentc7a6f1e4f8ff504bf617a0415b2c43ab3d339294
parent8787cd6d4ec9e403557e17d6083bb180874fc08c
resolved conflicts for merge of 8787cd6d to mnc-dev

Change-Id: I19497d05a021c21c905b2bddd5b36d370dc2208f
tools/releasetools/sparse_img.py