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

am 374fb150: am 535950bb: Merge "Fix PIC relocations for non-Bsymbolic builds"

* commit '374fb150a9447fe015d3417c94673378f9d016c8':
  Fix PIC relocations for non-Bsymbolic builds