tree 6d73ccfb9e8e1dd2050149753aaf36d138f1c8f7
parent 8dd60c3d2086db033952c71ac8163d9251a9add8
parent d96fd153646cc738b05b555c4c0e472254ec7fa7
author Hall Liu <hallliu@google.com> 1541801031 -0800
committer android-build-merger <android-build-merger@google.com> 1541801031 -0800

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

Change-Id: I37232a10e503887fdd436c4504a53f993da4f1b2