tree f745da05b33b20d091981e95eb597ebf60053080
parent b4c268eb7bbecd07cda2f82c63c534bfc9cdfa85
parent 464fed4f531d779ef094e8124f4d45b274da97ba
author Tao Bao <tbao@google.com> 1496273459 +0000
committer android-build-merger <android-build-merger@google.com> 1496273459 +0000

Merge "Remove the obsolete logic in img_from_target_files.py." am: ba029141dc am: f37c956b6d
am: 464fed4f53

Change-Id: If990a48a06ba4b48e865e4098d58fed4a074d896