am 8b300ed1: Merge "Don\'t die(immediate) if from performTraversals." into jb-mr1-dev
am 8b300ed1: Merge "Don\'t die(immediate) if from performTraversals." into jb-mr1-dev

* commit '8b300ed14f74a28ac7752d33b39bc7ac91bd9b26':
  Don't die(immediate) if from performTraversals.

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