am 8bd72025: resolved conflicts for merge of 8787cd6d to mnc-dev

Browse source

* commit '8bd720257eeaf9bf28b2dc8a36b856ccc30b1e8c':
  sparse_img.py: Don't write empty map groups.

...

This commit is contained in:

Tao Bao 2015-07-02 02:18:36 +00:00 committed by Android Git Automerger

parent ff57fb45c7 8bd720257e

commit 43bf14d27f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available