tree 12df11eab645100d46cf403eb92a38edacb2c55e
parent 0e3f0caee620fa624c0e20f0aab958e9377f33e5
parent 971003c9ffc854f4b080af902457e7a6447f692a
author Raph Levien <raph@google.com> 1389028562 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389028562 +0000

am 971003c9: am ece5bc9d: am 7b6b85d2: am d7d07498: am a980c7aa: Merge "Re-initialize error after attach"

* commit '971003c9ffc854f4b080af902457e7a6447f692a':
  Re-initialize error after attach