tree d4e3e4baaf7dba1bfbb94affbb28a21b0d14cfe5
parent 6b031adf08c4c205088257816a9f2c1d94e4811a
parent 475fe3f13b9be3205def52aa7c76395da06bb4a2
author Jorim Jaggi <jjaggi@google.com> 1521594240 +0000
committer android-build-merger <android-build-merger@google.com> 1521594240 +0000

Merge "Wait with reparenting back until all app animations are done" into pi-dev
am: 475fe3f13b

Change-Id: If88d3ff52402d14e5ae5eb4d8f4d1e849f6f9507