diff options
author | Adam Cohen <adamcohen@google.com> | 2014-12-04 18:17:52 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-04 18:17:52 +0000 |
commit | 2975e34145b38e44dc8a7def2617e3fe0d15321d (patch) | |
tree | b7e2c04c603fec99b029dc78729c5501b53855b0 | |
parent | e6673dc1fa94945925f4097f88dc2f5264c4316d (diff) | |
parent | d2285942dde8f2633f1d79abc01e598da7925090 (diff) | |
download | android_packages_apps_Trebuchet-2975e34145b38e44dc8a7def2617e3fe0d15321d.tar.gz android_packages_apps_Trebuchet-2975e34145b38e44dc8a7def2617e3fe0d15321d.tar.bz2 android_packages_apps_Trebuchet-2975e34145b38e44dc8a7def2617e3fe0d15321d.zip |
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
0 files changed, 0 insertions, 0 deletions