[automerger skipped] Merge "Add resolv_unit_test_config.xml for mts" into...
[automerger skipped] Merge "Add resolv_unit_test_config.xml for mts" into rvc-dev am: 6405f3e7 -s ours am: 78052b2d -s ours
am skip reason: Change-Id I45e45912f91e8d78891a8658f9f2e27c7e6252da with SHA-1 40702ff3 is in history
Change-Id: I9fe8aa5253b1fbacab6ddeaf465fb65ea1d7511c