tree 998478d524e86164670b5642a829dafacf8bb989
parent 0fbbb78532650c67585602268ef0c5ada52861bd
parent 13f13935ea916e426c1fde134751dd79df0f7faa
author Evan Rosky <erosky@google.com> 1525212943 -0700
committer android-build-merger <android-build-merger@google.com> 1525212943 -0700

Merge "Don't clear focus during transition animations" into pi-dev am: 09ba7e0bae
am: 13f13935ea

Change-Id: Id5e4345720f6307c1809cc0e36a144f1ddf8365b