am bad5f620: am 0bbcdc6c: Merge "verify database state before calling sqlite....
am bad5f620: am 0bbcdc6c: Merge "verify database state before calling sqlite. Bug:2593970" into froyo
Merge commit 'bad5f620' into kraken
* commit 'bad5f620':
verify database state before calling sqlite. Bug:2593970