tree c015295a91c9ead9c4bf4f0bbfad7c435c3886b0
parent 187fb7e6cab0701b9c4fec0b6074c15b3ef5703f
parent c1b97e05b0aee92b249a93e53b3f8151fcb74287
author satok <satok@google.com> 1300168025 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300168025 -0700

am c1b97e05: (-s ours) do not merge. Fix a race in system properties.

* commit 'c1b97e05b0aee92b249a93e53b3f8151fcb74287':
  do not merge. Fix a race in system properties.