diff options
| author | Jonathan Scott <scottjonathan@google.com> | 2019-05-23 10:28:45 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-23 10:28:45 -0700 |
| commit | e26301759a34c136fa6482046f2863a32a52e0e6 (patch) | |
| tree | ca8fcee07aafc5f0329a9a6bb11ed01988a6f312 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ed54acef44aac84174a616236e8ac09242945353 (diff) | |
| parent | 3f73d66538ff9f44470b77edda8ad286479c819e (diff) | |
[automerger skipped] [RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc). am: 3be29d429b am: c0c0827df5 -s ours am: b2c9f618d4 -s ours am: 4f4d45704d -s ours am: 7387317e85 -s ours am: 05c7303e83 -s ours
am: 3f73d66538 -s ours
am skip reason: subject contains skip directive
Change-Id: I49434ac033f67629f28aa0b39413de58659bb416
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions