| commit | 6948580a1ce2f76879ff428c2563dccfcce3d86f | [log] [tgz] |
|---|---|---|
| author | Adam Cohen <adamcohen@google.com> | Thu Dec 04 18:24:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 04 18:24:26 2014 +0000 |
| tree | 7198b45cb0d713f8cd87397442fdf4d54068d3a5 | |
| parent | 0887c181796c0899dfd4e6692d8611fa6e6744c9 [diff] | |
| parent | 2975e34145b38e44dc8a7def2617e3fe0d15321d [diff] |
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