tree 5f4c54a2c23bfd547d32b8c02dbfef5324ea9db6
parent a7aeba920089e43c38578f1fe72ed32dc9e5bc98
parent ee286963b220f3049aa5f8834c4c7d25d1fc3cd8
author Vitaly Buka <vitalybuka@google.com> 1454721208 +0000
committer android-build-merger <android-build-merger@google.com> 1454721208 +0000

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

* commit 'ee286963b220f3049aa5f8834c4c7d25d1fc3cd8': (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
  ...