tree a8641ac4c6ef77265f589a8abdbbd3b312599087
parent f9ed8be17da47f5003205bf1fbfc87a300de10f0
parent f9d3020c575fd20097f599dc336a3b448415b7d7
author Irfan Sheriff <isheriff@google.com> 1362436835 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1362436835 +0000

am f9d3020c: Merge "Clean up statemachine" into jb-mr2-dev

* commit 'f9d3020c575fd20097f599dc336a3b448415b7d7':
  Clean up statemachine