| commit | 0acf4069e98339911d998e95fc946dfa4b336f8e | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Jan 22 13:46:31 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 22 13:46:31 2013 -0800 |
| tree | 063a829f64061711e1d4682a754019a29911adbe | |
| parent | 25e3f4a90d7f314438ec9895618abf6116425a9f [diff] | |
| parent | 98ae1a85b057f6534bee7e52897a80694ba8b2e1 [diff] |
am 98ae1a85: am e652ed30: am 244bee5b: Merge "bionic_auxv.h: fix #define conflict" * commit '98ae1a85b057f6534bee7e52897a80694ba8b2e1': bionic_auxv.h: fix #define conflict