am 3ea87619: Merge "Fix crash in setNewPicture" into jb-dev
am 3ea87619: Merge "Fix crash in setNewPicture" into jb-dev

* commit '3ea8761974a530218a246dc73583c8820b12bf0b':
  Fix crash in setNewPicture

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