tree 2ccc1d27301c8a4ede935b73d557c2703d040c2b
parent b17d5cad0c7c3efc45ae5c59798e3f9b87247332
parent dc1adeebcf39401a3192618e6e2a0083e9f1c372
author Daniel Xie <dxie@google.com> 1466618316 +0000
committer android-build-merger <android-build-merger@google.com> 1466618316 +0000

Merge \\\\"Improve resiliency of message parser in the case that events are missing\\\\" into marshmallow-cts-dev am: 7df61f53d3 am: 246bf118b2 am: be1d0363a0
am: dc1adeebcf

Change-Id: I71fb458de3c3dd4ccaefc610496979c58d57d4de