| commit | 1744cae1895be1082404220667d1fecf7d148a71 | [log] [tgz] |
|---|---|---|
| author | Dave Santoro <dsantoro@google.com> | Wed Sep 21 18:56:41 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 21 18:56:41 2011 -0700 |
| tree | 5d49f4db3ccaabfc6d3ca25f1a1e3cdeddc3415f | |
| parent | 79168d502c62f205523a5f804c1df2864d193124 [diff] | |
| parent | ae94a710dbc0ea239277c25986e39ba53904c5fc [diff] |
am ae94a710: Merge "Change Settings insert conflict to do an update." into ics-factoryrom * commit 'ae94a710dbc0ea239277c25986e39ba53904c5fc': Change Settings insert conflict to do an update.