Merge remote-tracking branch 'cyanogen/cm-10.1' into cm-10.1
Merge remote-tracking branch 'mokee/jb-mr1_mkt' into HEAD
fix typo

Change-Id: I445e684754e0fcfae43b55d44717ffa36a3d87df