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