am d66cff12: am f7fd8a87: am 5638d3a6: Merge "Marking the Settings ContentProvider as singleUser" into lmp-dev
am d66cff12: am f7fd8a87: am 5638d3a6: Merge "Marking the Settings ContentProvider as singleUser" into lmp-dev

* commit 'd66cff12885b594017686d33b15fc4a089b933f8':
  Marking the Settings ContentProvider as singleUser

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