OSDN Git Service

am 69f8d3c6: (-s ours) am bbff7ed4: DO NOT MERGE : Ensure that the first post-restore...
authorChris Tate <ctate@google.com>
Wed, 12 Jan 2011 08:04:12 +0000 (00:04 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Jan 2011 08:04:12 +0000 (00:04 -0800)
commit439f94c05f8b7c5e377cba695725a487efc8c695
tree0ef8946de9dbdabcf6371f3334ee093ed0bf9465
parentc92a1b4142fbbcfb8647ae1c99b9a67e25075a45
parent02b4b6c97bb1ea2c12334d68efce8ee2624cc4d4
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