diff options
| author | Baligh Uddin <baligh@google.com> | 2014-08-16 04:00:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-16 04:00:42 +0000 |
| commit | 0be2a432847ecff029797228c58d744c6041844b (patch) | |
| tree | 298dcebf229b7d3a5284aee574a144ca11b4a4f0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ec24beafec548ccf7c369ffcc0e347a4ba3c2057 (diff) | |
| parent | 062feaf39594df4b09fc6e1b005bb72b334f3c79 (diff) | |
am 062feaf3: (-s ours) am 2f53238f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '062feaf39594df4b09fc6e1b005bb72b334f3c79':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions