am 8312b20d: Merge "Save/restore display lists\' canvas properly"
am 8312b20d: Merge "Save/restore display lists\' canvas properly"

* commit '8312b20d83b3ce886485c14f7ec5c8b45056a62f':
  Save/restore display lists' canvas properly

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