tree 7198b45cb0d713f8cd87397442fdf4d54068d3a5
parent 0887c181796c0899dfd4e6692d8611fa6e6744c9
parent 2975e34145b38e44dc8a7def2617e3fe0d15321d
author Adam Cohen <adamcohen@google.com> 1417717466 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417717466 +0000

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

* commit '2975e34145b38e44dc8a7def2617e3fe0d15321d':
  Ignoring specific db exception DO NOT MERGE