Skip to content
Commit 76e56e40 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

[automerger skipped] Merge "Add carrier config for allowing merge of RTT... 

[automerger skipped] Merge "Add carrier config for allowing merge of RTT calls" am: f99b67b6 -s ours am: 5b479c80 -s ours am: 170c2649 -s ours
am: 77cdafc2 -s ours
am skip reason: change_id I8cfdf68c69b50abed88d7c835db0480a53755f5a with SHA1 ef800080 is in history

Change-Id: I9d05f75e7ecf48508bf4df2affab0c9d82d8cd01
parents fa606ab1 77cdafc2
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