diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2019-06-06 12:10:21 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-06 12:10:21 -0700 |
| commit | a7755281a4cb322796c0e2023ac88c16d51a1a7f (patch) | |
| tree | 20043e160651d80b3dc719fccb852c97063f42b8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6c44f956ab92b924ed886e02be2b437dde9218ff (diff) | |
| parent | 865a7924938601407c32daa338c69a9cb53b7750 (diff) | |
[automerger skipped] Merge "[DO NOT MERGE] Handle config override via settings correctly am: dc0f443cb6 am: ac21b9edd4" into qt-r1-dev-plus-aosp
am: 865a792493 -s ours
am skip reason: subject contains skip directive
Change-Id: Id8d5ff7be1758ad48973b8f2c522c97d9b14d404
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions