tree cde93b0e5b4352b33a703078c901d30106c6ab92
parent 8d92b095daf69672e9ebb932c953b77c3afd17ee
parent aa0e47cbd6ccada9d194f39e6b4372d2d3594b38
author Android (Google) Code Review <android-gerrit@google.com> 1248287238 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1248287238 -0700

am aa0e47cb: Merge change 8179 into donut

Merge commit 'aa0e47cbd6ccada9d194f39e6b4372d2d3594b38'

* commit 'aa0e47cbd6ccada9d194f39e6b4372d2d3594b38':
  Fix SQL generated by updateWithOnConflict()