diff options
| author | Selim Cinek <cinek@google.com> | 2019-06-12 10:57:43 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-12 10:57:43 -0700 |
| commit | 269c4a9949455c90402032e90ef7267352368ac9 (patch) | |
| tree | 38151a46610ee648919ca4b3908a8123410fc41b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c9725ca52048be17fbd4ddeabf128f1e4a9dfc10 (diff) | |
| parent | b65fa9b944bd2e59950adbf7b5432fd7e762fcb8 (diff) | |
[automerger skipped] Merge "Fixes an issue where the wrong icons where ambient" into qt-dev am: 95a633d653 am: 4fce1c21da -s ours
am: b65fa9b944 -s ours
am skip reason: change_id I2e571353735efb0d763ecc236f60aefe4c2b51d4 with SHA1 da330ff413 is in history
Change-Id: I4718ccf7cfb864f91c3865585a9339270a738469
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions