Commit 2cb50fee authored by Sai Sasank Vempaty's avatar Sai Sasank Vempaty Committed by sai sasank vempaty
Browse files

Merge remote-tracking branch 'origin/atel-prop.lnx.3.0' into HEAD 

Conflicts:
	ims/src/org/codeaurora/ims/QtiCallConstants.java
	ims/src/org/codeaurora/ims/utils/QtiImsExtUtils.java

Change-Id: Ia16a300007e1e7164bf824d13132799cfd808ffc
parents 170bae9b b98b950c
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment