Skip to content
Commit 27c39f1a authored by Andreas Gampe's avatar Andreas Gampe
Browse files

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

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

(cherry picked from commit a5b55a01)
parent 6b3e0587
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment