OSDN Git Service

am 75f912ca: am dd309b97: Merge "Handle the case where an asynchronous prepare was...
authorAndreas Huber <andih@google.com>
Thu, 25 Apr 2013 23:57:31 +0000 (16:57 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 25 Apr 2013 23:57:31 +0000 (16:57 -0700)
commitc540ea00f4763758c9c40594d1e086aeefda9b70
treec34e228da5ecde54e8cca7544fa4e1080ed2e390
parentab5254653ea9f3886487144e76173c0b6a00f3e1
parent75f912ca9d8a03c91a421b80d96b81d87ef79d68
am 75f912ca: am dd309b97: Merge "Handle the case where an asynchronous prepare was initiated and then" into jb-mr2-dev

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