tree 875817d21d390652f0081021c8fa7b2a6d87e0de
parent 8c7f4777ec2127a95f7f0aea3bf32fe9309a6ada
parent 775dabd4d7f1c08d4229a3578d15990e86dd9c92
author Nick Kralevich <nnk@google.com> 1346108892 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346108892 -0700

am 775dabd4: am 9dfaa63a: Merge "Allow linker to compile with -DLINKER_DEBUG=1"

* commit '775dabd4d7f1c08d4229a3578d15990e86dd9c92':
  Allow linker to compile with -DLINKER_DEBUG=1