tree 6273fca841ecd0d874d2789fd01ded0a3b0bde10
parent a5005ea85a694da3223b1db9517894391217bb65
parent b4e4adc195861971166f993eb7323bff5af722db
author Tianjie Xu <xunchang@google.com> 1471026013 +0000
committer android-build-merger <android-build-merger@google.com> 1471026013 +0000

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

Change-Id: If37d29f7e5447651b384b98863425315ed9f3262