tree e6878e7a76db1edb1b4889b72101251f1e877990
parent 02160974829fe639fe1292b5cb5956438978b74d
parent 7b11cacbbabfa7a47d78d82d0aac24b94af1f81c
author Tianjie Xu <xunchang@google.com> 1471025201 +0000
committer android-build-merger <android-build-merger@google.com> 1471025201 +0000

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

Change-Id: Ia8e888a0f330d00f6518e352356ca480819586db