diff options
| author | Baligh Uddin <baligh@google.com> | 2014-03-14 16:27:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 16:27:44 +0000 |
| commit | 46bfaa1b93068c78ea5a2ab337ea8b98592b7c10 (patch) | |
| tree | fb3ba5c71a3b2d69ee6307a50db79873500a4bf5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d4981014d486c3ff72813d0d37048ee2abdb3d63 (diff) | |
| parent | a5a921e3a80eddd4622dd4d2d1c91d5ee71583f5 (diff) | |
am a5a921e3: (-s ours) am 4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'a5a921e3a80eddd4622dd4d2d1c91d5ee71583f5':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions