| commit | e84e02ec5932a56075e198e4b92151959ed2cf29 | [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 | 5c153ebeac0216779c05666f22955f64bbb8d505 | |
| parent | f6eb6915ad85e698576ff99e5139929da90ea2ce [diff] | |
| parent | 6eba882d8346f54775d561810f4632550cab826e [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.