am e03c0244: Merge "Clear data deletes too much" into jb-mr1-dev
am e03c0244: Merge "Clear data deletes too much" into jb-mr1-dev

* commit 'e03c0244717093e0fbc9b05073d3ae3dbd8fcea5':
  Clear data deletes too much

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