diff options
| author | Jonathan Scott <scottjonathan@google.com> | 2019-05-21 20:44:58 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-21 20:44:58 -0700 |
| commit | 2288a74328f9d8773b8b17402fcc95c2f28d3952 (patch) | |
| tree | 9ec29ebc72bf74df52f821b1b9f676a8ed6c5be3 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 7387317e8575097968f2199bdeae8a5c89905a02 (diff) | |
| parent | eaafe5e711c9147dd50bd091797f56eb6fbc3d9f (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc)." into oc-dev am: 4c9fa739ff am: 66785eeba5 -s ours am: 97d3ab297a -s ours
am: eaafe5e711 -s ours
am skip reason: subject contains skip directive
Change-Id: I6e554bb5fde073f966f921b1a48065b83886c6e1
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions