tree 89e7eded87e09f91293cfe0407dd0e0fc66b433f
parent ec8d92a5a371de325783859f2301eaf3747087e9
parent 947ef4e7ab4cc303fc708ee45a241969ca7ebbdc
author Dan Sandler <dsandler@android.com> 1390626207 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1390626207 -0800

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

* commit '947ef4e7ab4cc303fc708ee45a241969ca7ebbdc':
  Defend against missing DB during migration.