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

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