OSDN Git Service

am d2285942: (-s ours) Merge "Ignoring specific db exception DO NOT MERGE" into ub...
authorAdam Cohen <adamcohen@google.com>
Thu, 4 Dec 2014 18:17:52 +0000 (18:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Dec 2014 18:17:52 +0000 (18:17 +0000)
* commit 'd2285942dde8f2633f1d79abc01e598da7925090':
  Ignoring specific db exception DO NOT MERGE


Trivial merge