Commit 74013677 authored by Vladimir Marko's avatar Vladimir Marko Committed by android-build-merger
Browse files

Merge "x86/x86-64: Fix IMT conflict trampoline for obsolete methods." am: 11be88ca 

am: 95d72938

Change-Id: I687e397488b2ee0c2b2ebe6ec38ad16ad607edb9
parents 3ccdac26 95d72938
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