tree 5e54309f0837c34f6fdaf7651ef4b8e6497b0e2a
parent 04afcd25a3758090009d3261f4c573b8ed73e03a
parent e652ed30514afcf314b40c69b9cac088602a83da
author Nick Kralevich <nnk@google.com> 1358891026 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358891026 -0800

am e652ed30: am 244bee5b: Merge "bionic_auxv.h: fix #define conflict"

* commit 'e652ed30514afcf314b40c69b9cac088602a83da':
  bionic_auxv.h: fix #define conflict