tree f9e10ea4218ad59cfa7ba41fc35e23289ff0a115
parent 70d57945d5dd0db8b90c1083966b001a630cdfed
parent 03cd192eceb46f936ad89e6ae04dac130202e18c
author Vitaly Buka <vitalybuka@google.com> 1448313315 -0800
committer Vitaly Buka <vitalybuka@google.com> 1448313315 -0800

Merge commit '03cd192eceb46f936ad89e6ae04dac130202e18c' into HEAD

* commit '03cd192eceb46f936ad89e6ae04dac130202e18c':
  Add support for the custom colorXY trait
  Persist kInvalidCredentials state
  Fixed headers parsing in CurlHttpClient
  Replace clouddevices with weave in documentation and tests Removed OAuth scope parameter as optional.

Change-Id: If6f63c188d28af515714633d7058fc34c5f006f0