[automerger skipped] Merge "Makefile uses add_img_to_target_files module."
am:27480a0cf4
-s ours am skip reason: change_id Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117 with SHA1c1966a8bdd
is in history Change-Id: Ia777279685dc98bb7490380db88a31f32dac5921
This commit is contained in:
commit
03e726ce10