am 895156de: am d08bf0b2: Merge "Added error handling in the state change from "Load...
authorJames Dong <jdong@google.com>
Thu, 18 Oct 2012 03:21:45 +0000 (20:21 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 18 Oct 2012 03:21:45 +0000 (20:21 -0700)
* commit '895156dea6431fec87200f3b943abafe19c152c2':
  Added error handling in the state change from "Load state" to "Idle state".


Trivial merge