Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
InCallUI: Fix landscape layout

- http://review.cyanogenmod.org/65024 missed to do the button change
  also in landscape layout file, causing crash in landscape. Fixed.
- landscape layout updated according to the last 'qcril' merge
  (button order changed)

Change-Id: Ib75c7be432cc0f8ffc28c37d071ae18838cea26d
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge "InCallUI: Fix landscape layout" into cm-11.0
InCallUI: Improve latest CAF strings

Change-Id: If40628775393ab6e6fed6f92f8dbc2797c2b9f9f
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Hide Titlebar while loading InCallUI (2 of 2)

The conference call commits a few days ago caused the titlebar to
show when iniating a call during loading. These pair of commits
fix the behavior.

Change-Id: I69a915eef471b5f4ac4da087457cb50fba2e0400
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Fix mismerge

Change-Id: If04ed479b243e444b5ff4ef1250c6e2a60d9aea1
nCallUI: Store dialpad showing state (2/2)

Change-Id: Ie9b347bf8a0b41fdf78f0a8c1296e34bf681032d
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Automatic translation import

Change-Id: If9692ea6f89d7e325ad4691be850506be92c7fbc
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge branch 'cm-11.0' of git://github.com/cristianomatos/android_packages_apps_InCallUI into HEAD