tree 9d505ecee74a4d1ad5c4b9059533b85eb68be9fe
parent 374fb150a9447fe015d3417c94673378f9d016c8
parent ee8e2a29b072186828656c2bb1e813acab36779a
author Dan Albert <danalbert@google.com> 1407516791 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1407516791 +0000

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

* commit 'ee8e2a29b072186828656c2bb1e813acab36779a':
  Revert "Fix build after side-stepping global -Bsymbolic."