diff options
| author | Tingting Wang <tingtingw@google.com> | 2015-07-08 21:02:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-08 21:02:21 +0000 |
| commit | b8fb1343c35fd2d31434357f46c244336ac1d5f1 (patch) | |
| tree | def8aa4b30f450a973e0aba8d8388a8ab05e4096 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 28fd11c610e267b2a57cfc0e7b9c9e355c552928 (diff) | |
| parent | 79f44602a4cae17f262b024c9349c04d8dbcc5cf (diff) | |
am 79f44602: am eeb5b9d0: am 0f4595af: am 4ccf69e1: Merge "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev
* commit '79f44602a4cae17f262b024c9349c04d8dbcc5cf':
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