am 172cb769: Merge "Fixing onRestoreInstanceState crash in Launcher" into jb-mr1-dev
am 172cb769: Merge "Fixing onRestoreInstanceState crash in Launcher" into jb-mr1-dev

* commit '172cb769641c828d7ad20669a5f7c9533248382f':
  Fixing onRestoreInstanceState crash in Launcher

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