am 01ae2224: am 82f0d91a: am e667e41b: Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev
am 01ae2224: am 82f0d91a: am e667e41b: Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev

* commit '01ae222445e587504b9b9845be16193eff738371':
  Bugfix: use the correct user for ContentResolver calls

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