OSDN Git Service

am 3856df46: am b5aad4c5: Merge "ART: Add GENERATE_CFI to the ZygoteHooks debug flags"
authorAndreas Gampe <agampe@google.com>
Sat, 25 Apr 2015 01:10:53 +0000 (01:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 25 Apr 2015 01:10:53 +0000 (01:10 +0000)
* commit '3856df46f8ceb741b39dd40392b9485b47c35a54':
  ART: Add GENERATE_CFI to the ZygoteHooks debug flags


Trivial merge