OSDN Git Service

am 212453d3: Merge change 26096 into eclair
authorNeel Parekh <neel@google.com>
Fri, 25 Sep 2009 22:55:23 +0000 (15:55 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 25 Sep 2009 22:55:23 +0000 (15:55 -0700)
commit8ae54f35bba7bf7761dd490dbe5fc2b4841a1fc8
treef662ce6b24b1f4a0236da079abdfc9bda5247344
parent9961a22c87ceb844fb3b426b25f01bb0a1cca0d2
parent212453d3cb8f82313729b0e95e481cb1c06724ac
am 212453d3: Merge change 26096 into eclair

Merge commit '212453d3cb8f82313729b0e95e481cb1c06724ac' into eclair-plus-aosp

* commit '212453d3cb8f82313729b0e95e481cb1c06724ac':
  Try to do an update before inserting.