tree 7963d72590c357e6a1737b1bf3c23e7659ea9b17
parent 189460021aa72b46b1c9a05870201ecac04a7d8f
parent 936c7ed92fd3ae6c6e478dd6999326d6e087b3bf
author Andreas Gampe <agampe@google.com> 1437407581 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437407581 +0000

am 936c7ed9: am 16a150b8: Merge "ART: Fix arm32 quick_invoke_stub CFI"

* commit '936c7ed92fd3ae6c6e478dd6999326d6e087b3bf':
  ART: Fix arm32 quick_invoke_stub CFI