| commit | e3d4bc066071c3e875896a4b224c7685d7160a12 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Tue Sep 13 21:39:01 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Sep 13 21:39:01 2016 +0000 |
| tree | 371245b4d8a33129ffc97a166b7ffece2023ac1d | |
| parent | b9d4ec0954243b6438f57894214e58d4f8bf710d [diff] | |
| parent | 4eab1692ff44dae88d25bddd0f156baed2bcc43d [diff] |
Merge "Handle inconsistent values for PR_SET_TIMERSLACK_PID in android.os.cts.SeccompTest." into marshmallow-cts-dev