OSDN Git Service

am dd309b97: Merge "Handle the case where an asynchronous prepare was initiated and...
authorAndreas Huber <andih@google.com>
Thu, 25 Apr 2013 23:54:07 +0000 (16:54 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 25 Apr 2013 23:54:07 +0000 (16:54 -0700)
* commit 'dd309b97f3e30cb8ab30892b4bf6b5d824853a86':
  Handle the case where an asynchronous prepare was initiated and then


Trivial merge