diff options
| author | Justin Klaassen <justinklaassen@google.com> | 2016-07-20 01:06:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-20 01:06:36 +0000 |
| commit | 7b330a1f2ba9155eb6198557294057ae87940a39 (patch) | |
| tree | ab22d93d34197b049cada8324e6a9388499d04e4 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c26d7f362416325c278443d187f32d723f1b3f33 (diff) | |
| parent | 1e6e1ffeaa1806e2d06188941b5674cce55003c4 (diff) | |
Merge \"Add SETTINGS_CONDITION_NIGHT_DISPLAY\" into nyc-mr1-dev
am: 1e6e1ffeaa
Change-Id: I0204b25d35585c39ebea8ab797f00e1c027b86c5
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions