am 0ec61ff5: am 6d4d35e3: Merge "Revert "Update long strings to provide users with more information about permissions."" into jb-dev
am 0ec61ff5: am 6d4d35e3: Merge "Revert "Update long strings to provide users with more information about permissions."" into jb-dev

* commit '0ec61ff561010ef9b4512deffbf66598766172de':
  Revert "Update long strings to provide users with more information about permissions."

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base