tree 9a4664365889d54bbfa69471dfc94b25c75459e1
parent 62727a76d17781a249a5ae6588d732bc4c65ccb3
parent 52910403c5120761f863fe91c05e472b76c0b7d1
author Chen Xu <fionaxu@google.com> 1551850175 -0800
committer android-build-merger <android-build-merger@google.com> 1551850175 -0800

[automerger skipped] Merge "migrate cdma home eri from resource overlay to carrierconfig" am: 76b53f0948 am: e707f6217e
am: 52910403c5 -s ours
am skip reason: change_id Idd11441e1a6d79954aa1bdb0f93a3567aaf2ecc1 with SHA1 4933ef2310 is in history

Change-Id: I322f64d408457ddc536eef9fc8519a902cf61de4