tree e36d032bec67b60a1d6c08eb49be9459819eb99b
parent 7e62f22d78037aa93cffde60dd4d266418834500
parent b86af2577c630d2ea30b6c2a6bc13e03ae595c48
author Tianjie Xu <xunchang@google.com> 1478737387 +0000
committer android-build-merger <android-build-merger@google.com> 1478737387 +0000

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

Change-Id: I21b7f6df6facfcdb547e2aef3d4d8e19492c8e2d