| commit | e652ed30514afcf314b40c69b9cac088602a83da | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Jan 22 13:38:53 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 22 13:38:53 2013 -0800 |
| tree | 93ba99d4ea37aba0e5071e096ffafbed5cce0b7b | |
| parent | 8ef83bc46e06e8fe98e918fcb1c582d6f5807461 [diff] | |
| parent | 244bee5bb6e0bc12b739c57028ac8af23a18aed0 [diff] |
am 244bee5b: Merge "bionic_auxv.h: fix #define conflict" * commit '244bee5bb6e0bc12b739c57028ac8af23a18aed0': bionic_auxv.h: fix #define conflict