am d08bf0b2: Merge "Added error handling in the state change from "Load state" to...
authorJames Dong <jdong@google.com>
Thu, 18 Oct 2012 03:19:41 +0000 (20:19 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 18 Oct 2012 03:19:41 +0000 (20:19 -0700)
commit895156dea6431fec87200f3b943abafe19c152c2
tree402617cc6f15898d042fc035292922a8fe2a0aa7
parent770097a8c0ab093e347f5d7c28c5b7467cfff440
parentd08bf0b27662d58d1768123dc5e370322fc0308a
am d08bf0b2: Merge "Added error handling in the state change from "Load state" to "Idle state"." into jb-mr1-dev

* commit 'd08bf0b27662d58d1768123dc5e370322fc0308a':
  Added error handling in the state change from "Load state" to "Idle state".