summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge CAF branch 'LA.BR.1.2.1_rb2.19' into caf/cm-12.0.caf/cm-12.0Matt Garnes2015-03-0412-25/+195
|\
| * Merge "IMS-VT: Hide video views by default"Linux Build Service Account2015-02-212-4/+8
| |\
| | * IMS-VT: Hide video views by defaultSuresh Koleti2015-02-212-4/+8
| |/
| * Merge "IMS-VT: Hide end button when there is request to modify call"bait_dispatcher_monitor_system2015-02-191-3/+16
| |\
| | * IMS-VT: Hide end button when there is request to modify callRavi Paluri2015-02-191-3/+16
| |/
| * Merge "IMS-VT: Show glowpad view with accept/reject for most video upgrade ca...Linux Build Service Account2015-02-179-18/+171
| |\
| | * IMS-VT: Show glowpad view with accept/reject for most video upgrade casesNivedita Sarkar2015-02-169-18/+171
| |/
* | Merge CAF branch 'LA.BR.1.2.1_rb2.18' into caf/cm-12.0.Matt Garnes2015-02-239-37/+113
|\|
| * Merge "InCallUI: UI fix for VT"Linux Build Service Account2015-02-132-2/+4
| |\
| | * InCallUI: UI fix for VTRaj Yengisetty2015-02-122-2/+4
| |/
| * Merge "InCallUi: Update string for call on hold."Linux Build Service Account2015-02-122-4/+1
| |\
| | * InCallUi: Update string for call on hold.Adnan Begovic2015-02-112-4/+1
| |/
| * Merge "InCallUI: Fix InCallUI crash when making a call in guest mode"Linux Build Service Account2015-02-101-1/+3
| |\
| | * InCallUI: Fix InCallUI crash when making a call in guest modekaiyiz2015-02-061-1/+3
| * | Merge "Add more state for conference call"Linux Build Service Account2015-02-102-1/+9
| |\ \
| | * | Add more state for conference calljiadongz2015-02-092-1/+9
| | |/
| * | Merge "Fix Call duration time display issue When RCS enhance screen enabled."Linux Build Service Account2015-02-103-31/+42
| |\ \ | | |/ | |/|
| | * Fix Call duration time display issue When RCS enhance screen enabled.xmao2015-02-113-31/+42
| |/
| * Merge "Show conference dial error"Linux Build Service Account2015-02-052-1/+14
| |\
| | * Show conference dial errorjiadongz2015-02-042-1/+14
| * | Merge "Show conference participant state according to the config value."Linux Build Service Account2015-02-055-4/+46
| |\|
| | * Show conference participant state according to the config value.jiadongz2015-02-055-4/+46
| |/
* | Merge CAF branch 'caf/LA.BR.1.2.1_rb2.17' into caf/cm-12.0.Matt Garnes2015-02-1336-31/+1796
|\|
| * Merge "IMS: implement adding multi-participants to a exsiting conference call."Linux Build Service Account2015-02-033-0/+33
| |\
| | * IMS: implement adding multi-participants to a exsiting conference call.cdu2015-02-023-0/+33
| * | Merge "InCallUI: Add CN translation"Linux Build Service Account2015-02-032-0/+49
| |\ \
| | * | InCallUI: Add CN translationemancebo2015-02-032-0/+49
| |/ /
| * | Merge "InCallUI: Fixed force close"Linux Build Service Account2015-02-031-0/+1
| |\ \
| | * | InCallUI: Fixed force closexmao2015-02-031-0/+1
| |/ /
| * | Merge "InCallUI: Display operator name in select phone account dialog"Linux Build Service Account2015-02-011-1/+7
| |\ \
| | * | InCallUI: Display operator name in select phone account dialogkaiyiz2015-01-201-1/+7
| * | | Merge "InCallUI: Fix "Speaker and add call" icons not displayed completely"Linux Build Service Account2015-02-012-7/+29
| |\ \ \
| | * | | InCallUI: Fix "Speaker and add call" icons not displayed completelykaiyiz2015-01-282-7/+29
| | | |/ | | |/|
| * | | Merge "InCallUI: Modify review comments in InCallUI"Linux Build Service Account2015-02-014-87/+109
| |\ \ \
| | * | | InCallUI: Modify review comments in InCallUIxmao2015-01-284-87/+109
| * | | | Merge "InCallUI:add RCS support"Linux Build Service Account2015-02-016-13/+180
| |\| | |
| | * | | InCallUI:add RCS supportxmao2015-01-286-13/+180
| * | | | Merge "IncallUI: add RCS support"Linux Build Service Account2015-02-0121-17/+585
| |\| | |
| | * | | IncallUI: add RCS supportweichengzheng2015-01-2821-17/+585
| * | | | Merge "InCall"Linux Build Service Account2015-02-012-51/+36
| |\| | |
| | * | | InCallweichengzheng2015-01-282-51/+36
| * | | | Merge "IncallUI: add RCS enhance screen"Linux Build Service Account2015-02-017-0/+961
| |\| | |
| | * | | IncallUI: add RCS enhance screenweichengzheng2015-01-287-0/+961
| * | | | Merge "Fix for call recording state update"Linux Build Service Account2015-01-301-0/+4
| |\ \ \ \
| | * | | | Fix for call recording state updateemancebo2015-01-291-0/+4
| * | | | | Merge "Add missing views to fix incall crash in landscape mode"Linux Build Service Account2015-01-301-4/+39
| |\| | | | | | |/ / / | |/| | |
| | * | | Add missing views to fix incall crash in landscape modeemancebo2015-01-291-4/+39
| |/ / /
| * | | Merge "Handle NumberFormatException gracefully"Linux Build Service Account2015-01-282-9/+9
| |\ \ \ | | |/ / | |/| |
| | * | Handle NumberFormatException gracefullySreehari Vaddi2015-01-272-9/+9
| |/ /
* | | InCallUI: UI fix for VTRaj Yengisetty2015-02-122-2/+4