National roaming info for 3 in Ireland

Change-Id: I451831f4144b72feac1a38ef1e8693cb947d6d7e
Fix indention.

Change-Id: Ibbac20f4b8d14aaf753c463293bc4caa6c64cb91
Merge "National roaming info for 3 in Ireland" into cm-11.0
KeyguardServiceDelegate: disable DEBUG

Change-Id: Ia5476563f6ed7f9e3175233994676c038b3a8f67
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_frameworks_base into cm-11.0