tree e2493d070055f1448323b2fea0d7e4b364ca76aa
parent 4955bfb4caeb9b0b03b85a1e886674ddbccdb44f
parent e98c9fc8fa25d4d5a270276148696a2686ed000b
author Dan Albert <danalbert@google.com> 1426894233 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426894233 +0000

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

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