diff options
| author | Jonathan Scott <scottjonathan@google.com> | 2019-05-21 04:22:18 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-21 04:22:18 -0700 |
| commit | ffc54fc8b909609f7d1f60c8b418a1183f16e770 (patch) | |
| tree | 2cb8bfbda0c7844a8c299055e2bd242daf71d60e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 71e6ac93f35fbb2018d3219e256d4d3047cca133 (diff) | |
| parent | 84778db6b6672212381c7e695fd0a0ae18b3b919 (diff) | |
[automerger skipped] [RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc-mr1-dev). am: cd6c636800 -s ours
am: 84778db6b6 -s ours
am skip reason: subject contains skip directive
Change-Id: I40ef0278707e238f6b3e825f0c661800a02c7afe
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions