tree 8118a9eca77361ec48dee5ab2bb470470854f0ac
parent ad79ed2f721dc3b2e8e5b3c74835bddda29c8099
parent 4574ca1dff8f748e39a21f9bee029f832af98ea7
author Tao Bao <tbao@google.com> 1500921452 +0000
committer android-build-merger <android-build-merger@google.com> 1500921452 +0000

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

Change-Id: I3ee97953dc4e53354568924fb0b7baf67f119280