| commit | 7d4da4ea5cc6e5843a915e0e8b4f7c5fb8b0efb6 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed May 09 10:13:02 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 09 10:13:02 2012 -0700 |
| tree | cdcf060bc6ea334cb40cd7585032e99e67b66a1b | |
| parent | 8e38a509d2d9dfae85901fb5522131357b625a33 [diff] | |
| parent | 57f8d4b5b5564fad7a9c7f8a6e5108f31c75056f [diff] |
am 57f8d4b5: resolved conflicts for merge of 3919b96e to jb-dev-plus-aosp * commit '57f8d4b5b5564fad7a9c7f8a6e5108f31c75056f': Implement the "abort" stub in assembly for ARM.