tree 65a809caf96bdafbb97964294295a1c781ac0889
parent dd4a03a53b362956caefee868bf5c421b30600b5
parent 73e3d9f58c9edd2db254f072bd82bcecb2c13275
author Winson Chung <winsonc@google.com> 1502814583 +0000
committer android-build-merger <android-build-merger@google.com> 1502814583 +0000

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

Change-Id: I58e6cf60e0e7448c96752b99aa25cb5ad88a09b6