tree cc6c70f2f1bab4e68e6dae0ce40e734db3837f72
parent a4a1c0d4ee66f85376adbd71800e05b88b60c5b7
parent 9b650702113f8a17e09940c3802de71a9fc62ff1
author Xia Wang <xiaw@google.com> 1395180986 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395180986 +0000

am 9b650702: Merge "Fix state transition verification." into klp-dev

* commit '9b650702113f8a17e09940c3802de71a9fc62ff1':
  Fix state transition verification.