tree a2d21a43a2d06019f3e9d0179491390ec061e2fd
parent 7f9d210eefc2250c382e0fd4e22cebab6af48a70
parent a95fc5fea8ad520b85a85882b64bed0fe3c0001c
author Hall Liu <hallliu@google.com> 1480368016 +0000
committer android-build-merger <android-build-merger@google.com> 1480368016 +0000

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

Change-Id: I725b9456623d5781eff2c59abaf0d07c25dea252