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

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