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

* commit '6271654a55c1a7aaec721c14ae6b0873033bad2b':
  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