Merge commit '8fb0faf3cc2f792db8cf38fe5ab67c5eab7baa5c' into eclair-mr2-plus-aosp * commit '8fb0faf3cc2f792db8cf38fe5ab67c5eab7baa5c': Implement a HierarchicalStateMachine
Merge commit '8fb0faf3cc2f792db8cf38fe5ab67c5eab7baa5c' into eclair-mr2-plus-aosp * commit '8fb0faf3cc2f792db8cf38fe5ab67c5eab7baa5c': Implement a HierarchicalStateMachine