tree 7d4dc35b6517f68862274e49a18d342a4a3abbf7
parent e4fa5a50547466c79a55d598a4338a635b1d7e95
parent f70c20a8f96bce574da16ea6c265f88bc797f5aa
author David Pursehouse <david.pursehouse@sonymobile.com> 1423532093 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1423532094 +0000

Merge changes from topic 'events'

* changes:
  Add a custom JSON deserializer for ChangeEvents
  Add EventTypes class registering all stream event types