commit | 6fc02aa1c2a05eaa2487dd45de2c66818dc4f079 | [log] [tgz] |
---|---|---|
author | Alex Yakavenka <ayakav@codeaurora.org> | Fri Feb 13 14:29:03 2015 -0800 |
committer | Gerrit - the friendly Code Review server <code-review@localhost> | Wed Feb 18 03:16:52 2015 -0800 |
tree | 0d5dc9f44da8bc70b93a93758bc9972beedf5a66 | |
parent | 38fb72bfc2b3256d06d96f848be4be985d8556c3 [diff] |
InCallUI: Modify logic to show merge option Show merge option only when with active and background calls have MERGE_CONFERENCE capability Change-Id: Ib54c30a788ca2093a8be1ec997a521ba53f0c174 CRs-Fixed: 768007