| commit | 634595e905a1a37eed61c8b4bda687a028890b42 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Wed May 21 18:24:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 21 18:24:29 2014 +0000 |
| tree | e24fbc42ad62d06bc895d8cbd4fe9eed1f916a69 | |
| parent | 63d2ff97174c38cc1ce77d9ead6ea54551b57ba8 [diff] | |
| parent | 6c1f1688b0f1b2852df7132ba492c7fb28f1b07e [diff] |
am 6c1f1688: am 045fb3a5: am 9488238e: Merge "ART: Add INVOKE_TRAMPOLINE and imt_conflict stub to 64b architectures" * commit '6c1f1688b0f1b2852df7132ba492c7fb28f1b07e': ART: Add INVOKE_TRAMPOLINE and imt_conflict stub to 64b architectures