tree 582db6d764099c0252b30d5b95115ada5b6c283f
parent 31925d52f8dd88312845edef93da7873bd837447
parent 27afd409ac8ecde36e070e14e8fc521f89a33d0f
author Tony Wickham <twickham@google.com> 1525278019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1525278019 +0000

Merge changes from topic "am-c2841e6a-5061-492f-abbf-dfb8b89ccc04" into ub-launcher3-master

* changes:
  [automerger] Fix some state issues with user-controlled animations am: 31fbd4c08b
  Fix some state issues with user-controlled animations