OSDN Git Service

am 486d99f0: Merge "Don\'t allow text relocations on 64-bit."
authorElliott Hughes <enh@google.com>
Mon, 28 Oct 2013 21:39:05 +0000 (14:39 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 28 Oct 2013 21:39:05 +0000 (14:39 -0700)
* commit '486d99f050a609c16641614edc72d71746ce859a':
  Don't allow text relocations on 64-bit.


Trivial merge