am bfbab8ca: am a8cc20e5: Merge "b/3004029 Fixed content resolver loss" into gingerbread
am bfbab8ca: am a8cc20e5: Merge "b/3004029 Fixed content resolver loss" into gingerbread

Merge commit 'bfbab8ca36ed62a71118b355f2b8d8985bdb9d38'

* commit 'bfbab8ca36ed62a71118b355f2b8d8985bdb9d38':
  b/3004029 Fixed content resolver loss

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