Skip to content
Commit 6c75f0d2 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 1c376985: Merge 59fa028a from open-source master 

* commit '1c376985':
  Fix compilation error: invalid conversion from 'const char*' to 'char*'.
parents 439e88e7 1c376985
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