tree 71fb9d10330ef9161b3ead71d01074b3ef9e53ba
parent dfca0ee879a6cb14bcdabf34962dcec3b34a40b3
parent 7f4c2ea378b98162fd7d3740293cfb2dfecbfc90
author Android (Google) Code Review <android-gerrit@google.com> 1248264173 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1248264173 -0700

Merge change 8179 into donut

* changes:
  Fix SQL generated by updateWithOnConflict()