tree d38ec1dcec77c16a51787a1d93c77a9a56114993
parent 9fcda114ca0c77b660c46dd3fbc7c0531695c69a
parent 1e24b28e89223dc4749a54582e7eaf929ca0cb5f
author Goran Jakovljevic <Goran.Jakovljevic@imgtec.com> 1460390026 +0000
committer android-build-merger <android-build-merger@google.com> 1460390026 +0000

Merge "MIPS: Improving art_quick_imt_conflict_trampoline"
am: 1e24b28

* commit '1e24b28e89223dc4749a54582e7eaf929ca0cb5f':
  MIPS: Improving art_quick_imt_conflict_trampoline

Change-Id: I3e19e7c9ae0d8cb45dbfdd5edaff6c2ea2853879