tree 4ccb44a7fd19ac7fdca28e82b4e5f8251c234d80
parent a22dcfed28b7a2d511a4b57027b0faa3d98b2898
parent 684b056531e7a7411d85b77290751ee0f13819b2
author Winson Chung <winsonc@google.com> 1502813562 +0000
committer android-build-merger <android-build-merger@google.com> 1502813562 +0000

Merge "Add fallback to reset the waiting for transition state." into oc-dr1-dev
am: 684b056531

Change-Id: I77816bf56dedac6127301dc7ffd1f1de3e91031d