tree 18760c740f13ad57eb065276967289830c6ddd95
parent 3bd510a4fadd24e854670434016f3a451c02669c
parent f7da2fd4c07140b8d9a0b42227f894225aaf8484
author Dan Albert <danalbert@google.com> 1407454255 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1407454255 +0000

am f7da2fd4: Merge "Fix build after side-stepping global -Bsymbolic."

* commit 'f7da2fd4c07140b8d9a0b42227f894225aaf8484':
  Fix build after side-stepping global -Bsymbolic.