| commit | d4e57a8a4026b2ebabdc5f03170c6ff69d94b0cd | [log] [tgz] |
|---|---|---|
| author | satok <satok@google.com> | Tue Mar 15 23:26:26 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 15 23:26:26 2011 -0700 |
| tree | 026bac9f080285b2b9ebba3fca5817f33ff71cd0 | |
| parent | d6851475e0bc104e18a8d7cbcb1abd081f7f94a0 [diff] | |
| parent | f0a670eb12a0e5854dfd2a9284973d0711392653 [diff] |
am f0a670eb: (-s ours) do not merge. Fix a race in system properties. * commit 'f0a670eb12a0e5854dfd2a9284973d0711392653': do not merge. Fix a race in system properties.