tree 8118a9eca77361ec48dee5ab2bb470470854f0ac
parent d9c4ad10867e759dbe48ca6d9f3859c844ebea03
parent 71b8103bf11f676ed2c2ed5e2bef34b74b4ea16a
author Tao Bao <tbao@google.com> 1500926015 +0000
committer android-build-merger <android-build-merger@google.com> 1500926015 +0000

Merge "update_verifier: Handle legacy care_map.txt gracefully." into oc-mr1-dev
am: 71b8103bf1

Change-Id: I2fd922b746db80fed5b4212c70b04de9d54eb0cc