Merge commit '12a19551dd106b04898d262807213ce4c6d1e5f7' into eclair-mr2-plus-aosp * commit '12a19551dd106b04898d262807213ce4c6d1e5f7': If openOrCreateDatabase() throws an exception, delete
Merge commit '12a19551dd106b04898d262807213ce4c6d1e5f7' into eclair-mr2-plus-aosp * commit '12a19551dd106b04898d262807213ce4c6d1e5f7': If openOrCreateDatabase() throws an exception, delete