tree afcf1a8d123ea65f97df1b1f72be80c475240b8a
parent 7fbc9d39f3c927a1763d37cc3076fbcb7138b574
parent e10ff54e909094972f598ffc320a37347892ecdc
author Tianjie Xu <xunchang@google.com> 1478737778 +0000
committer android-build-merger <android-build-merger@google.com> 1478737778 +0000

Merge "Touch blocks in care_map in update_verifier" am: 3605a072bc  -s ours am: 96c3c32b66 am: b86af2577c
am: e10ff54e90

Change-Id: I8750814a16e8c3cb98c8c722b2211798b3a7e439