tree 9d4ff93a5d5cb28c2e38a336cb09ab7f7454bae1
parent 7831762308d6800f9e8c38f19cdd4162699ede7b
parent 13f44939b15e2fcf2bf6404240617a317bb9f5a8
author Tianjie Xu <xunchang@google.com> 1468536193 +0000
committer android-build-merger <android-build-merger@google.com> 1468536193 +0000

Merge \"Touch blocks in care_map in update_verifier\" into nyc-mr1-dev
am: 13f44939b1

Change-Id: I217e2883e45979b8cbdd7f0ce138d4b66f2e2b5d