tree 5eb2cd139b71e1a646ee5545421ef8a76bcae5f2
parent 31f3eeb5bda23069f9536a3fad55dc8001f308ab
parent 05e4ba0d5799d0b06ae09cb2b8d226faeb5c2cb4
author Sunny Goyal <sunnygoyal@google.com> 1465492358 +0000
committer android-build-merger <android-build-merger@google.com> 1465492358 +0000

Merge \"Executing the DB migration during startup instead of restore.\" into ub-launcher3-calgary
am: 05e4ba0d57

Change-Id: Ief999709d1d66752a1ee619a454b8771d3249c36