| commit | b43189b26f62f2b17569b07ab935ba7344be7433 | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Wed Jun 24 20:37:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 24 20:37:06 2015 +0000 |
| tree | 946346a3ff98e99785a83a55cf04eefb88b9d72a | |
| parent | 2195ea0faf04c326c655a5e7a2b8aa6e2c54db2d [diff] | |
| parent | 6d20c2e2d88de0116203e2d6ba80b996f858abc1 [diff] |
am 6d20c2e2: Merge "Fix imt conflict trampoline for mips64" into mnc-dev * commit '6d20c2e2d88de0116203e2d6ba80b996f858abc1': Fix imt conflict trampoline for mips64