tree c18e7d424f0b4322cc2a052fe1ade4453409675d
parent 34d5a2853c2f369b7c49ba3c5c357f846710246e
parent 13783d992d2da1ed649392b9a65370bfb94da2bf
author Brian Carlstrom <bdc@google.com> 1352163198 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352163198 -0800

am 13783d99: Merge "x86: Fix DT_TEXTREL in assembly code"

* commit '13783d992d2da1ed649392b9a65370bfb94da2bf':
  x86: Fix DT_TEXTREL in assembly code