am 3bb69233: Merge change 6620 into donut
am 3bb69233: Merge change 6620 into donut

Merge commit '3bb692338fed7f34f010398fe8b831d0de22c6e8'

* commit '3bb692338fed7f34f010398fe8b831d0de22c6e8':
  Keep Gears permissions in sync with system location settings.

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