[automerger skipped] Merge "Get resource based on subId for multi-SIM" into qt-r1-dev am: 559e7a3de1 am: c3c41babff -s ours

am: bd49c5e8eb -s ours
am skip reason: change_id Ib5b085d97103889600773d269e03b939c29ca47d with SHA1 0dc044aac7 is in history

Change-Id: Id9ee99550980efa1f12d44dc7db30a23c7766087
This commit is contained in:
Chiachang Wang
2019-08-17 07:44:03 -07:00
committed by android-build-merger

Diff Content Not Available