diff options
| author | Baligh Uddin <baligh@google.com> | 2014-08-22 18:36:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-22 18:36:15 +0000 |
| commit | 33a062f209823a26fbc868801ba2250f331340f6 (patch) | |
| tree | 3a4805a28afafa201f3010487b49fa29ec5a6cd2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 303df3b6ae4f6bac58012d5f14c9b764e944709b (diff) | |
| parent | 7da569a5868088f2579c792665cff95e3c55f2eb (diff) | |
am 7da569a5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '7da569a5868088f2579c792665cff95e3c55f2eb':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions