tree e36d032bec67b60a1d6c08eb49be9459819eb99b
parent 7da0c7e4394c9ab131a24bf9a7cfa571fdc89908
parent 96c3c32b666e081cb47bdab8a1025000a46757b2
author Tianjie Xu <xunchang@google.com> 1478737027 +0000
committer android-build-merger <android-build-merger@google.com> 1478737027 +0000

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

Change-Id: I94c50d0c24b1d0d2331b1c5fd117c06542c85533