tree 1dab9a8c7b5edbd65a358282ddd9018f37191b7d
parent 523e762ad43aaacbf494d207b9556d4f827d26c2
parent 7a9cda18eb31b5ab47d7eca064374eaa6efdc268
author Dan Sandler <dsandler@android.com> 1390626123 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1390626123 -0800

am 7a9cda18: Merge "Defend against missing DB during migration." into jb-ub-now-kermit

* commit '7a9cda18eb31b5ab47d7eca064374eaa6efdc268':
  Defend against missing DB during migration.