Skip to content
Commit 6a975c11 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I28031a27,If98d7397 into qt-dev 

* changes:
  Fix a bug in IncidentCompanionService
  Disable incidentd encryption.
parents a2f8ee47 816a7daf
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