tree 977b097721d87b1138153ad99503057fbcb9cc14
parent 85ecef2c6b7a624ba9db066ebefcfd0d394da6af
parent f2d02c38fb7a7b91ddbb7e54fffa1e9c6c0c7449
author Lorenzo Colitti <lorenzo@google.com> 1422331630 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422331630 +0000

am f2d02c38: Merge "Make bionic compile even if resolver debugging is enabled."

* commit 'f2d02c38fb7a7b91ddbb7e54fffa1e9c6c0c7449':
  Make bionic compile even if resolver debugging is enabled.