tree 026bac9f080285b2b9ebba3fca5817f33ff71cd0
parent efd1fc2fa60e12a370ba2ea37860ff989e64deb8
parent 49ad2447286b7b3af73f52d6f000f1452c7ece0a
author satok <satok@google.com> 1300168278 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300168278 -0700

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.