tree 926ddd9105871e89d0d834bfb015bc3b672aaf8b
parent c580e491caf54772681ed9ae40a97e84300e5950
parent 0148a6f9ab5ca63898f73a2e7e3f5b6bf61dca11
author Tao Bao <tbao@google.com> 1500921121 +0000
committer android-build-merger <android-build-merger@google.com> 1500921121 +0000

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

Change-Id: Id568b7cb5043c444f88032368be57a6f128a44c7