| commit | 13ab55918a0a114ce1d5c67eeca9c94ce08803ee | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Apr 03 12:37:52 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 03 12:37:52 2013 -0700 |
| tree | 28ea74420a0b66a6107989753e51bd2ec6572f7b | |
| parent | f5dc908695ad4e513504e1a29613d797b95adbf0 [diff] | |
| parent | 014c75c78bdcad8acde8d0abb2450aa1f78e1a1f [diff] |
am 014c75c7: Merge "Prevent name conflict for eventfd.cpp and eventfd.s when building libc.a" * commit '014c75c78bdcad8acde8d0abb2450aa1f78e1a1f': Prevent name conflict for eventfd.cpp and eventfd.s when building libc.a