tree 27d7e90467fb297736ba95093a03ea1e8d3bdf2b
parent 45e02909d40a9b3b38684388af64902e4bc8794b
parent fa0542dced666176d4cc7d0b7983ee59ccd23acc
author Tianjie Xu <xunchang@google.com> 1497400446 +0000
committer android-build-merger <android-build-merger@google.com> 1497400446 +0000

Merge "Fix duplicate 'META/care_map.txt' when calling add_img_to_target_files" am: 463c25f890
am: fa0542dced

Change-Id: Ia1d5b0b478f700b4df8ebbf9db10d4035d394792