tree 96651d3ff21c30fc7e2ba4ca03d382b8761353d2
parent b8c54d7966b8f8c7282e3463bdbfc8a923f1cf33
parent bf5e3d168d542ccdad307504c9c674e42fbe1432
author Tianjie Xu <xunchang@google.com> 1471025407 +0000
committer android-build-merger <android-build-merger@google.com> 1471025407 +0000

Merge "Replace META/care_map.txt when signing target files" am: 7b11cacbba
am: bf5e3d168d

Change-Id: I6476c710a220e2fe91dd06203ee418665ebd1a37