diff options
| author | Tim Murray <timmurray@google.com> | 2016-07-16 19:25:37 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-16 19:25:37 +0000 |
| commit | 62547293e37951459a2880f1644b67aed99b31b5 (patch) | |
| tree | 1a16e5963546d07bf68c35447d7380cb3c3deeda /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6a9f651b732537fe10eacf5a960439e9c4f378f7 (diff) | |
| parent | afa67f3d346c0439ff8f345728fef47eacff0406 (diff) | |
Merge \"Make sure StrictMode allows disk reads when calling isThreadInProcess.\" into nyc-mr1-dev
am: afa67f3d34
Change-Id: I2b3afb4acb9038a2d33ecf42bbbcc8c5d754ab5f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions