[automerger skipped] Merge "Get the resources associated with subid to support MSIM" am: cdbb700fa3

am: 302b8e8cfe -s ours
am skip reason: change_id Ib00cfe3640b59db5f971c32741eed999131e67c0 with SHA1 ea6d2b1e1e is in history

Change-Id: Ic1d323843fd065b527a70df6ff2fff40beb7a8a4
This commit is contained in:
Chen Xu
2019-06-05 11:15:08 -07:00
committed by android-build-merger

Diff Content Not Available