tree 45987e6e014eaac16c5823f7f76e751c66e76e5e
parent 6326ae9bf09db60ced8d228343c2113f504c7fe4
parent 37994f4c6834979360c32ad4877588a4cb446d06
author Alex Vakulenko <avakulenko@google.com> 1456338483 -0800
committer Alex Vakulenko <avakulenko@google.com> 1456338518 -0800

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

37994f4 Fix some of compiler warnings.
ebde3c1 Rename *BlackList* into *Revocation*
efbd66b Remove unused constants
5a1990f Implement revocation list check when validating auth token
51dcfad Add revocationTimestamp parameter into revocation entry
4846c44 Remove AccessBlackListManager::Unblock
958a359 Revert "debian: add debian packaging files"
7f2a5dc daemon: register device after component init
89b3495 Removing legacy API from libweave
1054d3e Move minimalRole constants from schema_constants.h to a local .cc file
9e9023e daemon/light: fix light trait def
6da60ad Fix use-after-free detected by ASAN
c23ea22 Replace expirationTimeoutSec with expirationTime
7c0ea69 Rename _accessControlBlackList into _accessRevocationList
012cd98 Move mock_component_manager.h into test/ dir
c6d99bb Move MockAccessBlackListManager into separate file
b612e3c Reset access token secret on new black list entry
d1d52e7 Add AccessBlackListManager::AddEntryAddedCallback
7fc5434 debian: add debian packaging files
634c408 Remove property from json added by mistake

Change-Id: I69380e60cf9888999224fdf11a5bc35f0bc7bda2