diff options
| author | Tingting Wang <tingtingw@google.com> | 2015-07-17 19:00:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-17 19:00:43 +0000 |
| commit | cee004330e0e7f928437a7b17e6263a1b12bfa8f (patch) | |
| tree | 3cb18ba13bc201592ab149150569b5dc8809ffd1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f4d5fa93bb9287a3748304436b4e57e8e8132713 (diff) | |
| parent | b1322a2a11b3475f2f657674d83b98884c308c09 (diff) | |
am b1322a2a: am 6aee4761: am ad359f2e: Merge "Revert "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev
* commit 'b1322a2a11b3475f2f657674d83b98884c308c09':
Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions