diff options
| author | Tingting Wang <tingtingw@google.com> | 2015-07-17 18:45:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-17 18:45:41 +0000 |
| commit | b1322a2a11b3475f2f657674d83b98884c308c09 (patch) | |
| tree | 65fb21b6fd42cf939cd9ea0b77251ca136297d2c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 55596f859acd376a3a0697f7a1f1c48330957246 (diff) | |
| parent | 6aee4761a826c3ef2793dc5c62d2451bd7450c61 (diff) | |
am 6aee4761: am ad359f2e: Merge "Revert "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev
* commit '6aee4761a826c3ef2793dc5c62d2451bd7450c61':
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