| commit | d6851475e0bc104e18a8d7cbcb1abd081f7f94a0 | [log] [tgz] |
|---|---|---|
| author | satok <satok@google.com> | Mon Mar 14 22:51:18 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 14 22:51:18 2011 -0700 |
| tree | 026bac9f080285b2b9ebba3fca5817f33ff71cd0 | |
| parent | efd1fc2fa60e12a370ba2ea37860ff989e64deb8 [diff] | |
| parent | 49ad2447286b7b3af73f52d6f000f1452c7ece0a [diff] |
am 49ad2447: (-s ours) am c1b97e05: (-s ours) do not merge. Fix a race in system properties. * commit '49ad2447286b7b3af73f52d6f000f1452c7ece0a': do not merge. Fix a race in system properties.