tree 29abefad70d170c110230dae2a91b296638c0f54
parent 8834cb2a5f330b050c760c30a1b3256189668e9d
author Dave Santoro <dsantoro@google.com> 1316560365 -0700
committer Dave Santoro <dsantoro@google.com> 1316638121 -0700

Change Settings insert conflict to do an update.

This was the behavior the Settings table had before (when uniqueness
was enforced by the primary key), and it was assumed by external
apps, including Twitter.

Bug 5336876

Change-Id: Iab792df6a5d31c780a33ddebabdb26c7768f373b