Automatic translation import

Change-Id: I086e8cdae02290e9153754f1c0a40abe6256ba4d
Apollo: fix npe when there is no data in the errorelement.

PS5: fix a regression which causes a crash elsewhere.
Change-Id: Ib1464e8ca0e1f61533ce0b0cd172accc21c21ce0
Jira: CYAN-2839
apollo: update media cursor according to passed uri

Check whether an external app is passing a MediaStore.File or MediaStore.Audio.Media uri
and update the cursor according to that uri.
JIRA: CYAN-4437
Issue: https://jira.cyanogenmod.org/browse/CYAN-4437

Change-Id: Ib378be6c2906bf35a69a34a95a81d1f3f77f9cce
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Automatic translation import

Change-Id: Iaa4918129b099fad42c644b6d304930ba2d7e223
Merge remote-tracking branch 'cm/cm-11.0' into kk4.4