am f0ccea92: Merge "Using the correct package name for ContentResolver" into lmp-dev
am f0ccea92: Merge "Using the correct package name for ContentResolver" into lmp-dev

* commit 'f0ccea9264761b45d55f7d98c234cfb3afde79be':
  Using the correct package name for ContentResolver

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