diff options
| author | satok <satok@google.com> | 2011-03-14 22:51:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-14 22:51:18 -0700 |
| commit | d6851475e0bc104e18a8d7cbcb1abd081f7f94a0 (patch) | |
| tree | 026bac9f080285b2b9ebba3fca5817f33ff71cd0 /sdcard | |
| parent | efd1fc2fa60e12a370ba2ea37860ff989e64deb8 (diff) | |
| parent | 49ad2447286b7b3af73f52d6f000f1452c7ece0a (diff) | |
| download | system_core-d6851475e0bc104e18a8d7cbcb1abd081f7f94a0.tar.gz system_core-d6851475e0bc104e18a8d7cbcb1abd081f7f94a0.tar.bz2 system_core-d6851475e0bc104e18a8d7cbcb1abd081f7f94a0.zip | |
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.
Diffstat (limited to 'sdcard')
0 files changed, 0 insertions, 0 deletions