am 2b6e7e1a: am ebf01ef4: Merge "Transition: Don\'t suppressLayout(false) for returning activity" into lmp-dev
am 2b6e7e1a: am ebf01ef4: Merge "Transition: Don\'t suppressLayout(false) for returning activity" into lmp-dev

* commit '2b6e7e1ad27678ee0f25b9a21b8fab353b9ab180':
  Transition: Don't suppressLayout(false) for returning activity

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