| commit | fdb3d31504bdaaad923d4add22cec9ba1ed5585f | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@google.com> | Thu Jun 08 00:32:30 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 08 00:32:35 2017 +0000 |
| tree | ea32c8aaca2d854f6a25b62e712a25e12e99fc7c | |
| parent | f34713066e92eadad97ddb2d05eb01a9e03bae61 [diff] | |
| parent | 65ac7619f9f6dceb83c26ce1a1bf7bfbaf2f57da [diff] |
Merge "Add timeout to StrictMode flash." into oc-dev