tree c2e4a0015b67542f5ce76afb04ab1992ce61617d
parent 8d2d4932b96632e9eb3af4a3d4000192ef603960
parent b5f28d4749b898d92fe5e56236b417e37b6fe84f
author Andreas Huber <andih@google.com> 1366929139 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1366929140 +0000

Merge "Handle the case where an asynchronous prepare was initiated and then" into jb-mr2-dev