| commit | ae94a710dbc0ea239277c25986e39ba53904c5fc | [log] [tgz] |
|---|---|---|
| author | Dave Santoro <dsantoro@google.com> | Wed Sep 21 14:47:59 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Sep 21 14:47:59 2011 -0700 |
| tree | 0ff2a0890e8953f136f6ddbdc8fbcbc1533620d9 | |
| parent | 078f588cef389358adabc579de00747878f3c108 [diff] | |
| parent | 0e21a867a572679d64d79041eb574d13665178d4 [diff] |
Merge "Change Settings insert conflict to do an update." into ics-factoryrom