tree 21e91c464dec5d9f1a5a55615c66f15ddc66149d
parent c57e34a9081e5e89379f0ef916a4d41347091a9e
parent 31fbd4c08ba9257ea2f85732c4d00b127d65875c
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1525200349 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1525200349 +0000

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

Change-Id: Ia7ee40b542775dc45859028ba923e8edcc83401d