| commit | dca43016043d80924c2c23c77170b944c3fafb3e | [log] [tgz] |
|---|---|---|
| author | Android Merger <android-build-merger@google.com> | Tue Sep 13 21:43:22 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Sep 13 21:43:22 2016 +0000 |
| tree | 5a12108c31dcf92080285dde57ce351a61bc45bf | |
| parent | 3a0c3310bfc814ce743b6803321e68b73d62497a [diff] | |
| parent | 5b42aae77ee1835bcf6a04edf994d5e4de593c57 [diff] |
Merge "Merge "Handle inconsistent values for PR_SET_TIMERSLACK_PID in android.os.cts.SeccompTest." into marshmallow-cts-dev am: e3d4bc0660" into nougat-cts-dev