commit | 156b9f3d12db7c3680630bfded9483e1fbe5f467 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri May 14 13:40:11 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 14 13:40:11 2010 -0700 |
tree | 6be6ca274d31aafac5843b4465d9208128627a0e | |
parent | a523b5b2ca70469e42fb48e2a99500e68a700f68 [diff] | |
parent | 538e5778be15382669b0058de5bafa9f4961247e [diff] |
am 538e5778: merge from open-source master Merge commit '538e5778be15382669b0058de5bafa9f4961247e' into kraken * commit '538e5778be15382669b0058de5bafa9f4961247e': sys_signame[] was added to libc, remove conflicting definition