tree d6becc01cda4726097a1cea2500974904fbd62da
parent 4948b9028c5a7f1307d7692bf5c27ec29ff42e06
parent 0d909f54d46a5c4e5143a0469f77472673fdd06a
author Jean-Baptiste Queru <jbq@google.com> 1345048778 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345048778 -0700

am 0d909f54: resolved conflicts for merge of b7415560 to jb-mr1-dev

* commit '0d909f54d46a5c4e5143a0469f77472673fdd06a':
  Clean up handling of multiple architectures in valgrind makefiles.