| commit | c34e097efc5eeefe977972b08a42509e8aa3ccc5 | [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 | c114c6509b7f552e76e55a3502e926436ccfb2d8 [diff] | |
| parent | 5a7501304d815552c3bfaee8789821e4884d073b [diff] |
Merge "Handle the case where an asynchronous prepare was initiated and then" into jb-mr2-dev