diff options
| author | Jonathan Scott <scottjonathan@google.com> | 2019-05-22 03:05:58 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-22 03:05:58 -0700 |
| commit | 05c7303e8311d7e3893a3e72b525079836b4324a (patch) | |
| tree | e7166cad3ad1adbb93578a0fce5ed12b2dc49b0c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1f9cf054831c57a933ca7a1af110811a8640ecca (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: I681088ce1e30c91e2d9b9a1730acd2f7a6ca2185
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions