Commit 9b73aa97 authored by Steven Laver's avatar Steven Laver Committed by Gerrit Code Review
Browse files

Merge changes from topic "QP1A.181202.001" into q-keystone-qcom-dev 

* changes:
  Provide a temporary instance of phone ID to fix a build error
  Resolve merge conflicts
  Merge QP1A.181202.001
parents 9829ad9b 94c26593
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment