tree 455e227577534b3a5392a045d0e212bfc3e0bf07
parent 1d923f5e546bca8fc83bc98c67c462ac3fa9466f
parent dbe9da53312b21730b38103abffc612bb23412c6
author Tao Bao <tbao@google.com> 1500920970 +0000
committer android-build-merger <android-build-merger@google.com> 1500920970 +0000

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

Change-Id: I87bb6d92a00b97e05b35736e5b9f247101bbac11