tree c18e7d424f0b4322cc2a052fe1ade4453409675d
parent 3ba5b529b12b7f3221ead51d90fcbc3ca96cb893
parent ec5aff0c95e7b98896abf61aa5b59166bac72715
author Brian Carlstrom <bdc@google.com> 1352163528 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352163528 -0800

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

* commit 'ec5aff0c95e7b98896abf61aa5b59166bac72715':
  x86: Fix DT_TEXTREL in assembly code