| commit | 13e4dfdcebe7ca083d38e3cb3a4ef0e3a8575788 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@google.com> | Thu Jun 08 05:47:38 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 08 05:47:38 2017 +0000 |
| tree | 3109dc181282790894a426be050988be2176113e | |
| parent | 2bb4966dab391f0add9982fc14549d07194e1527 [diff] | |
| parent | fdb3d31504bdaaad923d4add22cec9ba1ed5585f [diff] |
Merge "Add timeout to StrictMode flash." into oc-dev am: fdb3d31504 Change-Id: I646e27241743297d62a5442c845b61ee42b47a2f