Merge branch 'cm-11.0' into kk_mkt
Merge branch 'cm-11.0' into kk_mkt
Merge branch 'cm-11.0' into kk_mkt
Merge branch 'cm-11.0' into kk_mkt
Merge branch 'cm-11.0' into kk_mkt
Merge branch 'cm-11.0' into kk_mkt
Merge branch 'cm-11.0' into kk_mkt
Merge branch 'cm-11.0' into kk_mkt
Merge branch 'cm-11.0' into kk_mkt
Merge branch 'cm-11.0' into kk_mkt
Merge branch 'cm-11.0' into kk_mkt
Merge branch 'cm-11.0' into kk_mkt
Merge branch 'cm-11.0' into kk_mkt
Merge branch 'cm-11.0' into kk_mkt
Merge branch 'cm-11.0' into kk_mkt
Merge branch 'cm-11.0' into kk_mkt
Automatic translation import

Change-Id: I10325371d640ed26a3120a45df1ebf3204253416
Merge branch 'cm-11.0' into kk_mkt
apollo: ensure that the current cursor is opened

JIRA: BUGDUMP-21562
https://jira.cyanogenmod.org/browse/BUGDUMP-21562
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

Change-Id: Ib808e074145bf3dfc1686ec32a3168d2e46fc515
apollo: fix typo in sort order key

JIRA: BUGDUMP-21136
https://jira.cyanogenmod.org/browse/BUGDUMP-21136
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

Change-Id: I102e2b9766eed4bf84251789fee87f9008660edc