tree 8118a9eca77361ec48dee5ab2bb470470854f0ac
parent 7b1d9ad4a9f5c8d4d2d15c6aac695185bc6fecfe
parent 2357b0c74531d2bb22ebd68505c2d04dbe54667c
author Tao Bao <tbao@google.com> 1500921241 +0000
committer android-build-merger <android-build-merger@google.com> 1500921241 +0000

Merge "tests: Add a test to cover legacy care_map.txt handling." am: 6eb23c594c am: dbe9da5331 am: 0148a6f9ab
am: 2357b0c745

Change-Id: Ic8dfcde80f8dff11c33fac6a911ed278810590aa