| commit | 2cb50feec759b2bf6d26c77af3918a555a9b0230 | [log] [tgz] |
|---|---|---|
| author | Sai Sasank Vempaty <vempati@codeaurora.org> | Thu Apr 18 15:27:12 2019 +0530 |
| committer | sai sasank vempaty <vempati@codeaurora.org> | Mon Apr 29 13:47:41 2019 +0530 |
| tree | dde4c6c34172f7cdb9ed3bd4add297942531e9ee | |
| parent | 170bae9b2992981b442b2bb439b88967f9cc842e [diff] | |
| parent | b98b950ca5636cd9ed13ff4a6a90afca45457dce [diff] |
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