Skip to content
Commit 1be371dd authored by Joe Onorato's avatar Joe Onorato Committed by Android (Google) Code Review
Browse files

Merge changes I9706478e,I3fe2dea3,Ic65566c0 into qt-dev 

* changes:
  Make libplatformprotos-static, which is safe to use when you don't have shared libraries.
  Add additional system properties that can disable the face debugging codepath
  Fix mMaxOffset not initialized.
parents cf457b24 9bd5db7a
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