Skip to content
Commit 443dc0d7 authored by James Lin's avatar James Lin Committed by android-build-merger
Browse files

[automerger skipped] Merge "[RCS] Add carrier config... 

[automerger skipped] Merge "[RCS] Add carrier config "use_rcs_sip_options_bool" for check if SIP OPTIONS is supported" am: 74ad1b81 am: 54e73b6e am: 4099874d
am: 450c7298 -s ours
am skip reason: change_id I875e597fa3cb5d7f5a93989d2ff8e4abbbd9d045 with SHA1 c8a345a8 is in history

Change-Id: I5d23a67d5fee71ba1f4d3723fd67ac0ea3f6957c
parents 9a73f618 450c7298
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment