tree c5bc8b58b98dae9a36528d01274ad966ccaef2aa
parent 0af0f8297dc59ac39d3f1ea2f4e7857d0f09b719
parent a615f3daa0b51482f842e08f0c874933c421c35c
author Amit Mahajan <amitmahajan@google.com> 1478908690 +0000
committer android-build-merger <android-build-merger@google.com> 1478908690 +0000

Merge "Handle exception upgrading to db version 65 gracefully."
am: a615f3daa0

Change-Id: Ifcd68df9f73515f9dc3a61ed037ce1d92e388bc2