| commit | d06eefb992dad1a5330b1a6b6ed5be72b9b0e5bf | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Wed Oct 29 12:31:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 12:31:18 2014 +0000 |
| tree | 057c3b700722b55d9c5e686b882fe59364abad67 | |
| parent | 72d047f5a3a102442111ffe1efc3a69f68477392 [diff] | |
| parent | ac293277b69882105810fabd6c53f55de58823fe [diff] |
am ac293277: Merge "Add gp initialization to the art_quick_imt_conflict_trampoline() function." * commit 'ac293277b69882105810fabd6c53f55de58823fe': Add gp initialization to the art_quick_imt_conflict_trampoline() function.