tree ffdc0b44ea1d1831e4add053847253443f3c4f3c
parent b6f6bbf4de119badbcf155956703e206faab5e7d
parent 6d8c5edbab7a641558c233aa0df1259d2ab883b9
author Jay Shrauner <shrauner@google.com> 1419010837 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1419010837 +0000

am 6d8c5edb: am 5413fd74: Merge "Handle SQLiteFullExceptions" into lmp-mr1-dev

* commit '6d8c5edbab7a641558c233aa0df1259d2ab883b9':
  Handle SQLiteFullExceptions