diff options
| author | Alan Viverette <alanv@google.com> | 2014-06-05 23:16:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-05 23:16:17 +0000 |
| commit | efa65cc8e7fe9f63747b52594e4077d5588c3b26 (patch) | |
| tree | 8ae3d6fdf8f9aacb5a0039595ed39a3006b149a8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7d3ff83b8b7d4a69f8426d2d1fb0788583ce4338 (diff) | |
| parent | 4294202648c4d5d471386d9344dae9579bdb18a1 (diff) | |
am 6f2ed69f: (-s ours) Merge "DO NOT MERGE Change preference category text color for quantum" into lmp-preview-dev
* commit '6f2ed69f25dad726baabe67b98c9107fd9bcaa46':
DO NOT MERGE Change preference category text color for quantum
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions