diff options
| author | Baligh Uddin <baligh@google.com> | 2014-04-22 14:52:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-22 14:52:43 +0000 |
| commit | 49c4aeef081d7c9f075027cd9112858cdcab8166 (patch) | |
| tree | d5f81e75c6fb735cd035abac6323223e801abc67 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | af57bb911ae57b21569dc1bf19048eaa05fbefb8 (diff) | |
| parent | 94723401bdfaf2d1a5c792654fe18d7f6d21607e (diff) | |
am 94723401: (-s ours) am 04acf38c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '94723401bdfaf2d1a5c792654fe18d7f6d21607e':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions