tree f5a71ac7c79267939ce05cb972602b955d789198
parent 98e02adb75b472d1a883b52503f33b82495590d2
parent c580e491caf54772681ed9ae40a97e84300e5950
author Tao Bao <tbao@google.com> 1500914341 +0000
committer android-build-merger <android-build-merger@google.com> 1500914341 +0000

Merge "update_verifier: Handle legacy care_map.txt gracefully." am: 15ae0f01c3 am: fdb5d1cd8c am: 1d923f5e54
am: c580e491ca

Change-Id: I7c479ca76006f5402c4bfbedb8d4fc570b722754