Custom Carrier Text from AOKP (2/2)
Merge branch 'sm-jb-mr1' of https://github.com/Slayjay78/android_frameworks_base into sm-jb-mr1