tree 90074bce02e07c1288fa5b6a1b2cc77227317182
parent dafe3a502739dfe6f6eaedf541742e0dfc5e02cd
parent 0d7aac840eaf1cfc14af1e5e39f3fe281d86ead5
author Vitaly Buka <vitalybuka@google.com> 1447790922 -0800
committer Vitaly Buka <vitalybuka@google.com> 1447790922 -0800

Merge remote-tracking branch 'remotes/weave/master' into weave_aosp-master

* remotes/weave/master:
  Replace https://www.googleapis.com/clouddevices/v1/ with https://www.googleapis.com/weave/v1.
  Set "WiFi discovery" bit of device flags according state of Hosted SSID. Return true only if device is hosting AP or if flags are being generated for SSID.
  Updated api_key, client_id and client_secret
  Add missing UI device kinds