tree c64cb9df8f56bf05f40dc60c9ee0c7bdabff80fb
parent 31b994e8e93e04e29f59ac98e845b42750668178
parent 34a7cdc8ceb2d767a642d013914e681e21979987
author Tao Bao <tbao@google.com> 1528266578 -0700
committer android-build-merger <android-build-merger@google.com> 1528266578 -0700

Merge "tests: Specify the death test style to avoid flakiness." am: 878d5a77f0 am: d770790a8f
am: 34a7cdc8ce

Change-Id: I2b1b39d5bd47744d102b55736730348a94cede7e