tree 300678da96e9564e562c410ea81b6675c88ae218
parent 51b40ee3eb11595655552ed25269c2fe0c29cd9f
parent 01106c45cafa18acb16817e8519c9dcf02b32760
author Hall Liu <hallliu@google.com> 1480367204 +0000
committer android-build-merger <android-build-merger@google.com> 1480367204 +0000

Merge "Add removeState method to StateMachine" am: 0310de1136
am: 01106c45ca

Change-Id: I4f31491b1c9db29fe14222788d7fbd1fd6bce068