diff options
| author | Tingting Wang <tingtingw@google.com> | 2015-07-17 19:23:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-17 19:23:23 +0000 |
| commit | 435d6efc45af19759d5642d91e9532604888e767 (patch) | |
| tree | 6955dbb0ec3997c82d02e5f89f2f48ec079ffefe /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6b2d1be6628fa80a4e2c9f8c893606dc1030cf7f (diff) | |
| parent | cee004330e0e7f928437a7b17e6263a1b12bfa8f (diff) | |
am cee00433: am b1322a2a: am 6aee4761: am ad359f2e: Merge "Revert "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev
* commit 'cee004330e0e7f928437a7b17e6263a1b12bfa8f':
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