commit | f55c94c23893639f841cd1f8c3c7d047b968685d | [log] [tgz] |
---|---|---|
author | Android Merger <android-build-merger@google.com> | Thu Mar 16 02:25:32 2017 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Mar 16 02:25:33 2017 +0000 |
tree | 971c2006fcf15df9a9063f1d726d387af15e6c90 | |
parent | 9810987ef04fdda202c747d5d157efb33a389739 [diff] | |
parent | 658368878bdc582c69084e1d3a8a67fec12316e5 [diff] |
Merge "Merge "Merge "Merge "Fix android.os.cts.SeccompTest for Nougat on i386 and x86_64." into marshmallow-cts-dev am: 27cd0e6f97" into nougat-cts-dev am: b11aa5ee88" into nougat-mr1-cts-dev am: f5aa04b3d4"