am 5bcbf857: Merge "Fix icon-related crash." into mnc-dev
am 5bcbf857: Merge "Fix icon-related crash." into mnc-dev

* commit '5bcbf857d129f4513e562801a4e88077b2655ade':
  Fix icon-related crash.

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