Merge remote-tracking branch 'cm/cm-10.2' into HEAD
m7vzw: access vzw apps in Play store

Change-Id: I1603fc286cc4241c73a7e020363a117da8350972
Merge remote-tracking branch 'cm/cm-10.2' into HEAD

Conflicts:
	cm.mk

Change-Id: I4acb74f884a6e43d14e74f89b24106fcdea62d80
Merge remote-tracking branch 'vanir/kk44' into HEAD