commit 36211c089da06dce3289675a4c2cb191ac9a3ad8
author Robert Carr <racarr@google.com> Fri Apr 15 06:26:15 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 15 06:26:15 2016 +0000
tree ae13993c963e8364e12ba16a5a82079916050e77
parent 021af1800c352933d25f927dc357534c62a9e39c
parent bb9fb194f85225fcf0360fc53da51f12a649bd1b

Merge changes Id603816c,I86e41324,I025d0558,I44d8dbac,Iabfc2e81, ... into nyc-dev
am: bb9fb19

* commit 'bb9fb194f85225fcf0360fc53da51f12a649bd1b':
  Only set mResizedWhileNotDragResizing for base windows.
  Fix Task dim with docked resize.
  Correct window replacement string comparison.
  Replace DimLayers with windows.
  Prevent premature window replacement.
  Correctly prevent entrance animation for replacing windows.
  Replace secondary app windows across activity relaunch.

Change-Id: Idd6d2aff728ede67408671b7ab928f24c04e4934