| commit | 0486f78ef32dfddb51c82f12be533712a35376d8 | [log] [tgz] |
|---|---|---|
| author | Brad Fitzpatrick <bradfitz@android.com> | Tue Sep 07 22:10:41 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 07 22:10:41 2010 -0700 |
| tree | 5a9cb74d3610170367b2c470a13a12aa4be07fb0 | |
| parent | 9b717b5e53d2c4908007ff7c7afed70afbd89f1a [diff] | |
| parent | b1657b2bd6aea0c22b48e2cdd25dcc57581a3f3d [diff] |
am b1657b2b: resolved conflicts for merge of 64591009 to gingerbread-plus-aosp Merge commit 'b1657b2bd6aea0c22b48e2cdd25dcc57581a3f3d' * commit 'b1657b2bd6aea0c22b48e2cdd25dcc57581a3f3d': Fix a race between requesting/loading/writing SharedPreferences.