tree a0eda29cd89f5cc13a7a20b1cd4198297d4703fc
parent 1bcb248db9bc17aa7f78496324ebb105d3890434
parent fe664ce3d2b2e7292f7a6aef2be6eb2fdc343d56
author Xia Wang <xiaw@google.com> 1395182753 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395182753 +0000

am fe664ce3: am 454fc6b1: am 560e7541: am 1b007565: am 9b650702: Merge "Fix state transition verification." into klp-dev

* commit 'fe664ce3d2b2e7292f7a6aef2be6eb2fdc343d56':
  Fix state transition verification.