| commit | ba0ec8947ec5a2c1c9a64fa311a82aa26172b759 | [log] [tgz] |
|---|---|---|
| author | Alex Yakavenka <ayakav@codeaurora.org> | Fri Feb 13 17:11:29 2015 -0800 |
| committer | Alex Yakavenka <ayakav@codeaurora.org> | Tue Mar 10 17:29:05 2015 -0700 |
| tree | f39afa1c2da92058b5ee18ff65c6fe02eea90ba2 | |
| parent | 6a5e0ec63c06104c0c0a24fcd23b46695b967cfb [diff] |
Telephony: add isMergeAllowed functionality Change-Id: Ie1eb6346da6428c3664433bc6d8fb0cf006bb8b4 CRs-Fixed: 768007 Conflicts: src/com/android/services/telephony/TelephonyConnection.java