OSDN Git Service

am 57f8d4b5: resolved conflicts for merge of 3919b96e to jb-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Wed, 9 May 2012 17:13:02 +0000 (10:13 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 May 2012 17:13:02 +0000 (10:13 -0700)
commit7d4da4ea5cc6e5843a915e0e8b4f7c5fb8b0efb6
treecdcf060bc6ea334cb40cd7585032e99e67b66a1b
parent8e38a509d2d9dfae85901fb5522131357b625a33
parent57f8d4b5b5564fad7a9c7f8a6e5108f31c75056f
am 57f8d4b5: resolved conflicts for merge of 3919b96e to jb-dev-plus-aosp

* commit '57f8d4b5b5564fad7a9c7f8a6e5108f31c75056f':
  Implement the "abort" stub in assembly for ARM.