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