tree 9b7b8057d7efcfa8ea076c20607b4550265a3364
parent ba8d3d6109293558e24cf9422229b6951680e4ad
parent e90962ff1d54f489bc906b6e1dd3da49e0ab2330
author Hall Liu <hallliu@google.com> 1541731229 -0800
committer android-build-merger <android-build-merger@google.com> 1541731229 -0800

Merge "Fix flaky AnalytisTest by locking in EventRecord" am: 0a390095df
am: e90962ff1d

Change-Id: Ifa04c8d827c3ce9c34454115fcb45ed092377dda