diff options
author | Jeff Sharkey <jsharkey@google.com> | 2017-06-08 05:47:38 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-06-08 05:47:38 +0000 |
commit | 13e4dfdcebe7ca083d38e3cb3a4ef0e3a8575788 (patch) | |
tree | 3109dc181282790894a426be050988be2176113e /rs/java/android/renderscript/Program.java | |
parent | 2bb4966dab391f0add9982fc14549d07194e1527 (diff) | |
parent | fdb3d31504bdaaad923d4add22cec9ba1ed5585f (diff) |
Merge "Add timeout to StrictMode flash." into oc-dev
am: fdb3d31504
Change-Id: I646e27241743297d62a5442c845b61ee42b47a2f
Diffstat (limited to 'rs/java/android/renderscript/Program.java')
0 files changed, 0 insertions, 0 deletions