| commit | 49ad2447286b7b3af73f52d6f000f1452c7ece0a | [log] [tgz] |
|---|---|---|
| author | satok <satok@google.com> | Mon Mar 14 22:47:05 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 14 22:47:05 2011 -0700 |
| tree | c015295a91c9ead9c4bf4f0bbfad7c435c3886b0 | |
| parent | 187fb7e6cab0701b9c4fec0b6074c15b3ef5703f [diff] | |
| parent | c1b97e05b0aee92b249a93e53b3f8151fcb74287 [diff] |
am c1b97e05: (-s ours) do not merge. Fix a race in system properties. * commit 'c1b97e05b0aee92b249a93e53b3f8151fcb74287': do not merge. Fix a race in system properties.