tree 4f1128ab7f9298fec5134add57cfeb898dbdaf21
parent 30034ab30b15d286f5fb76699d676469dc71695e
parent 34c8499cc0fadea73233b0bd8e33f26811972ad1
author John Reck <jreck@android.com> 1346976930 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346976930 -0700

am 34c8499c: am d22af61d: Merge "Added catch of SQLiteException when updating screenshot"

* commit '34c8499cc0fadea73233b0bd8e33f26811972ad1':
  Added catch of SQLiteException when updating screenshot