tree 29151f6460b391abaa2da31321890dd6729d3b0b
parent 575f1c6625b468712f2aa37e68cf0835e65f8f78
parent 6b524fe0b23cb698154896415290eef94f4b7ae5
author Ian Parkinson <ianp@google.com> 1392423842 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392423842 +0000

am 6b524fe0: am 8944f244: Merge Launcher3 jb-ub-now-kermit to kermit-release

* commit '6b524fe0b23cb698154896415290eef94f4b7ae5':
  Defend against missing DB during migration.