merge

Change-Id: I1ccd140ccef409c6ed21cc5d141452f1f04c1531
Merge branch 'cm-11.0' of git://github.com/johnnyslt/android into default