diff options
| author | Jonathan Scott <scottjonathan@google.com> | 2019-05-22 08:21:27 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-22 08:21:27 -0700 |
| commit | 3f73d66538ff9f44470b77edda8ad286479c819e (patch) | |
| tree | b1217930a57d522c1ec4add6677d205504769810 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1308be9dc9966c6fa76e9447f64c26b6304b3de6 (diff) | |
| parent | 05c7303e8311d7e3893a3e72b525079836b4324a (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 skip reason: change_id I40c9a29935d9e5a27cdcdf90187efe61035448fd with SHA1 cd6c636800 is in history
Change-Id: I20cd2985ceb47cf2932aea127596132a9f462f16
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions