diff options
| author | Baligh Uddin <baligh@google.com> | 2013-08-09 17:14:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-09 17:14:45 -0700 |
| commit | 2d1716a8cdc95977c243fe8a642b41f42be565d0 (patch) | |
| tree | fa3722e5e3a919d9046fdff1bc3cb2338149616a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 06c2bad60079099b2496f2939655b72ffc649b29 (diff) | |
| parent | 67d5c290e4d9319d4613c95e05dd3cf2560db3c3 (diff) | |
am 67d5c290: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '67d5c290e4d9319d4613c95e05dd3cf2560db3c3':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions