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

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