| commit | 75f912ca9d8a03c91a421b80d96b81d87ef79d68 | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Thu Apr 25 16:54:07 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 25 16:54:07 2013 -0700 |
| tree | f56fd9f5388430978309fe894e492b740863fbf6 | |
| parent | 4fcff8859393adce884ea958c66d471a4c36b55f [diff] | |
| parent | dd309b97f3e30cb8ab30892b4bf6b5d824853a86 [diff] |
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