Commit 6c1f1688 authored by Andreas Gampe's avatar Andreas Gampe Committed by Android Git Automerger
Browse files

am 045fb3a5: am 9488238e: Merge "ART: Add INVOKE_TRAMPOLINE and imt_conflict... 

am 045fb3a5: am 9488238e: Merge "ART: Add INVOKE_TRAMPOLINE and imt_conflict stub to 64b architectures"

* commit '045fb3a5':
  ART: Add INVOKE_TRAMPOLINE and imt_conflict stub to 64b architectures
parents 2912810b 045fb3a5
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment