tree 5f4c54a2c23bfd547d32b8c02dbfef5324ea9db6
parent c176b8c284dc0ba59fbdd7eb46a441a711d1873a
parent d69c671dd410651c37103e67187a703157a08593
author Vitaly Buka <vitalybuka@google.com> 1454720903 +0000
committer android-build-merger <android-build-merger@google.com> 1454720903 +0000

Merge remote-tracking branch \'weave/master\' into \'weave/aosp-master\'
am: d69c671dd4

* commit 'd69c671dd410651c37103e67187a703157a08593': (27 commits)
  Fix some libevhtp usage details.
  libevhtp requires libevent-dev
  Add customizable settings option for xmpp_endpoint
  cmake is used to build gtest and libevhtp
  Update libuweave/macaroon code
  Revert "Make internal googletest optional."
  Fix incorrect weave setting file path
  Make internal googletest optional.
  Make internal libevhtp optional.
  Fix GCC warning
  Make App ID a part of User ID
  Update macaroon lib with version supporting empty strings
  Remove unused line
  Add kUwMacaroonDelegateeTypeService caveat
  Add session ID validation
  Remove crypto type "None"
  Update macaroon lib
  Integrate new macaroon library
  Update macaroon lib
  Fix build errors introduced by
  ...