OSDN Git Service

Merge "Ignoring specific db exception DO NOT MERGE" into ub-now-porkchop
authorAdam Cohen <adamcohen@google.com>
Thu, 4 Dec 2014 18:14:22 +0000 (18:14 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 4 Dec 2014 18:14:22 +0000 (18:14 +0000)

Trivial merge