am 97b707d5: am 80a058b3: Merge "Do not attempt to decode  NULL SkData." into klp-dev
am 97b707d5: am 80a058b3: Merge "Do not attempt to decode  NULL SkData." into klp-dev

* commit '97b707d5eb34d5e76e2b820c158b14fe47631be0':
  Do not attempt to decode  NULL SkData.

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