diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-13 16:01:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 16:01:16 +0000 |
| commit | bb732e968d6fd5c1b7c4c83509bd54a53d16923b (patch) | |
| tree | 933afff8eeb2b66569e41799e504e413ed0e0f11 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 97720a07a7d5350a2e5de4d1d96f5bd5cad8e596 (diff) | |
| parent | 7458493e55fc2c04332dcfe5824c4111adf41ebf (diff) | |
am 7458493e: (-s ours) am 584e10e1: (-s ours) am 9bee6f1a: (-s ours) am 7ff74826: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '7458493e55fc2c04332dcfe5824c4111adf41ebf':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions