OSDN Git Service

am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp
authorAndreas Gampe <agampe@google.com>
Mon, 27 Apr 2015 18:28:18 +0000 (18:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Apr 2015 18:28:18 +0000 (18:28 +0000)
commita5b55a017a984608eacdf414bc1cbcd7615f1c13
treeb032022984bed52deb52e86528f5b008dc6aec9f
parent20186c4b68b613266c694639319137f522607076
parentb6d14a009e43a4d61ae2a4f98f6e3b914148d0a9
am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp

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