[automerger skipped] Merge "Makefile uses add_img_to_target_files module." am: 27480a0cf4 -s ours

am: 03e726ce10 -s ours
am skip reason: change_id Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117 with SHA1 c1966a8bdd is in history

Change-Id: I46a6f921e67f78523b3940da59cff4bd065e2a17
This commit is contained in:
Tao Bao 2019-08-14 22:03:50 -07:00 committed by android-build-merger
commit d531e4f984

Diff content is not available