| commit | dd309b97f3e30cb8ab30892b4bf6b5d824853a86 | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Thu Apr 25 22:32:19 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 25 22:32:20 2013 +0000 |
| tree | c2e4a0015b67542f5ce76afb04ab1992ce61617d | |
| parent | 8d2d4932b96632e9eb3af4a3d4000192ef603960 [diff] | |
| parent | b5f28d4749b898d92fe5e56236b417e37b6fe84f [diff] |
Merge "Handle the case where an asynchronous prepare was initiated and then" into jb-mr2-dev