tree f495d942fee442f851309a1b5976615e5a0be4c8
parent 2411590b716d16540e8018dfb4382d4c57812f27
parent ba01142727b353fb2c78c2bd9eb4f6d1d3696f38
author Alex Vakulenko <avakulenko@google.com> 1450196256 -0800
committer Alex Vakulenko <avakulenko@google.com> 1450196326 -0800

Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'

The following changes are included in this merge:

47743a3 Fixed name of the function to match design docs.
aef87f5 Oven virtual device sample initial commit. Used as weave device for CES demo.
b3de351 Fix device registration expiration with system clock adjusted
532140d Add 'timeMs' field to /privet/info local API
6fdca1f component_manager: fix uint comparison in unittest
1884cf6 Rename timeMs into time
b03d4dd Remove /privet/info:uptime as unused
30ba607 privet/security_manager: remove unused functions
63c9862 Add local_auth_info_changed -> root_client_token_owner
76e924f Fix index in the loop of uw_crypto_utils_equal_
0de42f5 Add test to verify that token from different secret is not accepted
e08c7c6 Add macaroon auth token verification
cc77fad Add ClaimRootClientAuthToken and ConfirmRootClientAuthToken
29bc593 Use ClaimRootClientAuthToken instead of GetRootClientAuthToken
229113e Pass Config pointer into AuthManager
3eb52e7 Add the ability to query for particuar component and filter fields
0c190b3 Call ConfirmAuthToken when upload is done
a10ab1c Provide RootClientTokenOwner into ClaimRootClientAuthToken
ba01142 Remove unused kTokenDelimeter variable

Change-Id: I8bb0b536d6c28304255f27ed2738a57952ed0682