tree 8118a9eca77361ec48dee5ab2bb470470854f0ac
parent 9c9c579239a53c67ab85d89b40795de89a98777a
parent 25a05fc938a0cc5d4253074e4a9f8b738bf4520d
author Tao Bao <tbao@google.com> 1500926195 +0000
committer android-build-merger <android-build-merger@google.com> 1500926195 +0000

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

Change-Id: I8b39471b35d10a6a597eb3a276ea892803c24a09