27c39f1adeaf1a653fb41a5af64ee815b8048dd6 - platform/frameworks/base

commit	27c39f1adeaf1a653fb41a5af64ee815b8048dd6	[log] [tgz]
author	Andreas Gampe <agampe@google.com>	Mon Apr 27 18:28:18 2015 +0000
committer	Andreas Gampe <agampe@google.com>	Tue Apr 28 13:46:00 2015 -0700
tree	d72907f43cbae396ee91c3b1b31e8db1184dfd50
parent	6b3e0587a052121fd572fd609abcbc75a89d53d6 [diff]

am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp

* commit 'b6d14a009e43a4d61ae2a4f98f6e3b914148d0a9':
  Frameworks/base: Add debug.gencfi property

(cherry picked from commit a5b55a017a984608eacdf414bc1cbcd7615f1c13)

core/java/android/os/Process.java[diff]
core/java/com/android/internal/os/Zygote.java[diff]
core/java/com/android/internal/os/ZygoteConnection.java[diff]
core/jni/AndroidRuntime.cpp[diff]
services/core/java/com/android/server/am/ActivityManagerService.java[diff]

5 files changed

tree: d72907f43cbae396ee91c3b1b31e8db1184dfd50