| commit | 5b634b394b5ae0cd623ac4c142538c68495bee5e | [log] [tgz] |
|---|---|---|
| author | Jeff Hao <jeffhao@google.com> | Thu Jun 16 01:30:56 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 16 01:30:56 2016 +0000 |
| tree | 57b128817b01799a09f94b8e544301cb7adac8b2 | |
| parent | edf1d3410b16fb8667647dda67d2a0bb372b5fe3 [diff] | |
| parent | 5a386d0dbdefe34ebb318bcd98b26f550b376bd5 [diff] |
Merge \\"Use a barrier instead of sleep for flaky deadlock test.\\" am: 61b370e455 am: 5a386d0dbd Change-Id: I8fa340840f79bee1822525ec502ebfc50aadd7a3