[automerger skipped] No longer show disambig when calling SmsManager#getSubId am: 26b242f75e am: 09a6b60098 -s ours
am:9bccfb7801-s ours am skip reason: change_id Ibbc07c961f1bdc19e1015885487e9f7b6a14fa83 with SHA142ce8673bbis in history Change-Id: Iddc6e76480c521073c4a70653c420a5bcdd62766
This commit is contained in: