Commits
Andreas Gampe authored 27c39f1adea
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)