diff options
| author | Jonathan Scott <scottjonathan@google.com> | 2019-05-21 23:50:39 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-21 23:50:39 -0700 |
| commit | c5335d502d2130974b73b319dc8c47bca52517c0 (patch) | |
| tree | 03d7ff3fd075174d5bb30466ba927b6e98bbe19e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8b6771a4ef49d0ec11f32393ef2c81b008faa83d (diff) | |
| parent | 7387317e8575097968f2199bdeae8a5c89905a02 (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 skip reason: change_id I40c9a29935d9e5a27cdcdf90187efe61035448fd with SHA1 cd6c636800 is in history
Change-Id: I424f0446de4a906e4b3e4929f57da8891c5942b8
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions