commit | ba96a561e25754eacc0197590c4b449ad625de00 | [log] [tgz] |
---|---|---|
author | Chris Tate <ctate@google.com> | Wed Jan 12 00:04:12 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 12 00:04:12 2011 -0800 |
tree | 48ce837c57eefded326e85cc985f38fff0274203 | |
parent | 46af781a1cf17c324a4d58a1b70b6ce3937e3750 [diff] | |
parent | 69f8d3c667669dc1858c21ee798c0f836f53235e [diff] |
am 69f8d3c6: (-s ours) am bbff7ed4: DO NOT MERGE : Ensure that the first post-restore backup pass is correct * commit '69f8d3c667669dc1858c21ee798c0f836f53235e': DO NOT MERGE : Ensure that the first post-restore backup pass is correct