tree c5bc8b58b98dae9a36528d01274ad966ccaef2aa
parent 91e8f5eea8806ed7f914db86107bc06a87f5d70d
parent 09c788dab53162ebe27fa55b36f16aa2a10dfe86
author Amit Mahajan <amitmahajan@google.com> 1478909084 +0000
committer android-build-merger <android-build-merger@google.com> 1478909084 +0000

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

Change-Id: Id8ff0052fc20b80e3ba2749d6d25aea5ea637650