tree c64cb9df8f56bf05f40dc60c9ee0c7bdabff80fb
parent 8eed4aca52e3ce01777a6feef786d37a711527c3
parent d770790a8f3af4b8eb6e86aab225393d128ec043
author Tao Bao <tbao@google.com> 1528266335 -0700
committer android-build-merger <android-build-merger@google.com> 1528266335 -0700

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

Change-Id: Ia87e290bacfbad079e4aedf30a6f2c2c2ab13e9b