tree 65e4d697756c1a1578f03e63c622266635b19545
parent 603fce9abb00f8c641bbd7f224ced0caa2e1cbd8
parent 51f763506c7bb34420242e88e1631550f94d6417
author Andreas Gampe <agampe@google.com> 1400696075 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1400696076 +0000

Merge "ART: Add INVOKE_TRAMPOLINE and imt_conflict stub to 64b architectures"