tree c2c35df2c268553d7395fa50a52ac61d2ba8af9d
parent e9caeafa9a953be0cbe974043920d72cec9ddf22
parent d22af61d97b938d0c4124fbdaae627f3e85e7084
author John Reck <jreck@android.com> 1346976699 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346976699 -0700

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

* commit 'd22af61d97b938d0c4124fbdaae627f3e85e7084':
  Added catch of SQLiteException when updating screenshot