am 2382c3a9: Merge "Add DATA_SET value to Entity from EntityIterator cursor"
am 2382c3a9: Merge "Add DATA_SET value to Entity from EntityIterator cursor"

* commit '2382c3a92fcc00f9d4c9642724a04d79977f2fde':
  Add DATA_SET value to Entity from EntityIterator cursor

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