tree b7e2c04c603fec99b029dc78729c5501b53855b0
parent e6673dc1fa94945925f4097f88dc2f5264c4316d
parent d2285942dde8f2633f1d79abc01e598da7925090
author Adam Cohen <adamcohen@google.com> 1417717072 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417717072 +0000

am d2285942: (-s ours) Merge "Ignoring specific db exception DO NOT MERGE" into ub-now-porkchop

* commit 'd2285942dde8f2633f1d79abc01e598da7925090':
  Ignoring specific db exception DO NOT MERGE