Merge remote-tracking branch 'cyanogen/cm-11.0' into cm-11.0
Automatic translation import

Change-Id: Ia0e767120f828d67fa205888b84c92ffa649a8c4
Merge remote-tracking branch 'cyanogen/cm-11.0' into cm-11.0
Merge branch 'cm-11.0' of github.com:Quarx2k/android_frameworks_base into cm-11.0