tree f56fd9f5388430978309fe894e492b740863fbf6
parent 4fcff8859393adce884ea958c66d471a4c36b55f
parent dd309b97f3e30cb8ab30892b4bf6b5d824853a86
author Andreas Huber <andih@google.com> 1366934047 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366934047 -0700

am dd309b97: Merge "Handle the case where an asynchronous prepare was initiated and then" into jb-mr2-dev

* commit 'dd309b97f3e30cb8ab30892b4bf6b5d824853a86':
  Handle the case where an asynchronous prepare was initiated and then