am 306df863: Merge "New location service permission strings." into jb-mr1-dev
am 306df863: Merge "New location service permission strings." into jb-mr1-dev

* commit '306df86302a96c7bf3d86aed81190c10ea6c2ccd':
  New location service permission strings.

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