Lais Andrade ab00a09510 resolve merge conflicts of 5e6c470008055c8415eaff5816a8c18bff207c3c to sc-v2-dev ... Fix: 192648440 Test: manual Change-Id: Iae021732381c658f3ec9d8b3c9069810f7263f40		2021-07-02 13:43:22 +00:00
..
frameworks/base	resolve merge conflicts of 5e6c470008055c8415eaff5816a8c18bff207c3c to sc-v2-dev	2021-07-02 13:43:22 +00:00
packages/apps	Update ./DevInfo/Mod model name	2021-06-25 02:12:11 +00:00